Changeset 13056 for issm/trunk-jpl/src/c/Container/Options.cpp

Timestamp:

08/15/12 19:10:41 (13 years ago)

Author:

glperez

Message:

CHG: Correction from the 13046 revision

File:

• issm/trunk-jpl/src/c/Container/Options.cpp (modified) (9 diffs)

issm/trunk-jpl/src/c/Container/Options.cpp

@@ -47 +47 @@
 
         /*Also, check the option name*/
-        if(!in_option->name) _error2_("input option has an empty name");
-        if(strchr(in_option->name,'.')) _error2_("Option \"" << in_option->name << "\" has a protected character \".\"");
-        if(strchr(in_option->name,'[')) _error2_("Option \"" << in_option->name << "\" has a protected character \"[\"");
-        if(strchr(in_option->name,']')) _error2_("Option \"" << in_option->name << "\" has a protected character \"]\"");
+        if(!in_option->name) _error_("input option has an empty name");
+        if(strchr(in_option->name,'.')) _error_("Option \"" << in_option->name << "\" has a protected character \".\"");
+        if(strchr(in_option->name,'[')) _error_("Option \"" << in_option->name << "\" has a protected character \"[\"");
+        if(strchr(in_option->name,']')) _error_("Option \"" << in_option->name << "\" has a protected character \"]\"");
 
         /*Finally, check that no option of the same name already exists in the dataset*/
@@ -57 +57 @@
                 option=(Option*)(*object); 
                 if (!strcmp(option->name,in_option->name)){
-                        _error2_("Options \"" << in_option->name << "\" found multiple times");
+                        _error_("Options \"" << in_option->name << "\" found multiple times");
                         break;
                 }
@@ -83 +83 @@
         /*Else, the Option does not exist, no default provided*/
         else{
-                _error2_("option of name \"" << name << "\" not found, and no default value has been provided");
+                _error_("option of name \"" << name << "\" not found, and no default value has been provided");
         }
 }
@@ -121 +121 @@
         /*Else, the Option does not exist, no default provided*/
         else{
-                _error2_("option of name \"" << name << "\" not found, and no default value has been provided");
+                _error_("option of name \"" << name << "\" not found, and no default value has been provided");
         }
 }
@@ -159 +159 @@
         /*Else, the Option does not exist, no default provided*/
         else{
-                _error2_("option of name \"" << name << "\" not found, and no default value has been provided");
+                _error_("option of name \"" << name << "\" not found, and no default value has been provided");
         }
 }
@@ -199 +199 @@
         /*Else, the Option does not exist, no default provided*/
         else{
-                _error2_("option of name \"" << name << "\" not found, and no default value has been provided");
+                _error_("option of name \"" << name << "\" not found, and no default value has been provided");
         }
 
@@ -264 +264 @@
                 /*Else: not supported*/
                 else{
-                        _error2_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum()));
+                        _error_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum()));
                 }
         }
@@ -290 +290 @@
         /*Else, the Option does not exist, no default provided*/
         else{
-                _error2_("option of name \"" << name << "\" not found, and no default value has been provided");
+                _error_("option of name \"" << name << "\" not found, and no default value has been provided");
         }
 }
@@ -324 +324 @@
                                 /*Else: not supported*/
                                 else{
-                                        _error2_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum()));
+                                        _error_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum()));
                                 }
                         }