Changeset 6412 for issm/trunk/src/c/shared/String/DescriptorIndex.cpp

Timestamp:

10/25/10 08:57:04 (15 years ago)

Author:

Mathieu Morlighem

Message:

moved ISSMERROR to _error_, ISSMASSERT to _assert_ and ISSMPRINTF to _printf_

File:

• issm/trunk/src/c/shared/String/DescriptorIndex.cpp (modified) (3 diffs)

issm/trunk/src/c/shared/String/DescriptorIndex.cpp

@@ -23 +23 @@
         /*retrieve first token, separated by underscore: */
         pch = strtok (descriptor,"_");
-        if(!pch)ISSMERROR("%s%s%s"," descriptor ",descriptor," is not correctly formatted!");
+        if(!pch)_error_("%s%s%s"," descriptor ",descriptor," is not correctly formatted!");
 
         if (strncmp(pch,"scaled",6)==0){
                 /*we have a scaled variable. recover the root: */
                 pch = strtok (NULL, "_");
-                if(!pch)ISSMERROR("%s%s%s"," scaled descriptor ",descriptor," is not correctly formatted!");
+                if(!pch)_error_("%s%s%s"," scaled descriptor ",descriptor," is not correctly formatted!");
                 strcpy(root,pch);
                 /*now recover  the index if it exists: */
@@ -43 +43 @@
                 /*we have an indexed variable. recover the root: */
                 pch = strtok (NULL, "_");
-                if(!pch)ISSMERROR("%s%s%s"," indexed descriptor ",descriptor," is not correctly formatted!");
+                if(!pch)_error_("%s%s%s"," indexed descriptor ",descriptor," is not correctly formatted!");
                 strcpy(root,pch);
                 /*now recover  the index: */
                 pch = strtok (NULL, "_");
-                if(!pch)ISSMERROR("%s%s%s"," indexed descriptor ",descriptor," is not correctly formatted!");
+                if(!pch)_error_("%s%s%s"," indexed descriptor ",descriptor," is not correctly formatted!");
                 sscanf(pch,"%i",pindex);
                 return IndexedEnum;
@@ -54 +54 @@
                 /*we have an indexed variable. recover the root: */
                 pch = strtok (NULL, "_");
-                if(!pch)ISSMERROR("%s%s%s"," nodal descriptor ",descriptor," is not correctly formatted!");
+                if(!pch)_error_("%s%s%s"," nodal descriptor ",descriptor," is not correctly formatted!");
                 strcpy(root,pch);
                 /*now recover  the index: */
                 pch = strtok (NULL, "_");
-                if(!pch)ISSMERROR("%s%s%s"," nodal descriptor ",descriptor," is not correctly formatted!");
+                if(!pch)_error_("%s%s%s"," nodal descriptor ",descriptor," is not correctly formatted!");
                 sscanf(pch,"%i",pindex);
                 return NodalEnum;