Changeset 16367

Timestamp:

10/10/13 14:09:25 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added StringToEnum return -1 if not found

Location:

issm/trunk-jpl/src/c/shared/Enum

Files:

• Enum.h (modified) (1 diff)
• StringToEnumx.cpp (modified) (2 diffs)
• Synchronize.sh (modified) (2 diffs)

issm/trunk-jpl/src/c/shared/Enum/Enum.h

@@ -6 +6 @@
 const char* EnumToStringx(int enum_in);
 void        EnumToStringx(char** string,int enum_in);
-int         StringToEnumx(const char* string_in);
+int         StringToEnumx(const char* string_in,bool notfounderror=true);
 
 #endif

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -12 +12 @@
 #include "../Exceptions/exceptions.h"
 
-int  StringToEnumx(const char* name){
+int  StringToEnumx(const char* name,bool notfounderror){
 
    int  stage=1;
@@ -619 +619 @@
    }
         /*If we reach this point, the string provided has not been found*/
-        _error_("Enum " << name << " not found");
+        if(notfounderror)
+                _error_("Enum " << name << " not found");
+        else
+                return -1;
 }

issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh

@@ -73 +73 @@
 #include "../Exceptions/exceptions.h"
 
-int  StringToEnumx(const char* name){
+int  StringToEnumx(const char* name,bool notfounderror){
 
    int  stage=1;
@@ -97 +97 @@
 cat <<END >> $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp
         /*If we reach this point, the string provided has not been found*/
-        _error_("Enum " << name << " not found");
+        if(notfounderror)
+                _error_("Enum " << name << " not found");
+        else
+                return -1;
 }
 END