Changeset 12494 for issm/trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp

Timestamp:

06/21/12 10:10:34 (13 years ago)

Author:

Mathieu Morlighem

Message:

replaced all _error_ to _error2_

File:

• issm/trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp

@@ -23 +23 @@
         /*retrieve first token, separated by underscore: */
         pch = strtok (descriptor,"_");
-        if(!pch)_error2_("" << " descriptor " << descriptor << " is not correctly formatted!");
+        if(!pch)_error2_(" 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)_error2_("" << " scaled descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_(" scaled descriptor " << descriptor << " is not correctly formatted!");
                 memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
 
@@ -44 +44 @@
                 /*we have an indexed variable. recover the root: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_("" << " indexed descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_(" indexed descriptor " << descriptor << " is not correctly formatted!");
                 memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
                 /*now recover  the index: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_("" << " indexed descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_(" indexed descriptor " << descriptor << " is not correctly formatted!");
                 sscanf(pch,"%i",pindex);
                 return IndexedEnum;
@@ -55 +55 @@
                 /*we have an indexed variable. recover the root: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_("" << " nodal descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_(" nodal descriptor " << descriptor << " is not correctly formatted!");
                 memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
                 /*now recover  the index: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_("" << " nodal descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_(" nodal descriptor " << descriptor << " is not correctly formatted!");
                 sscanf(pch,"%i",pindex);
                 return NodalEnum;