Changeset 12328

Timestamp:

06/01/12 17:23:55 (13 years ago)

Author:

Mathieu Morlighem

Message:

Synchronized Enums

Location:

issm/trunk-jpl/src

Files:

• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (3 diffs)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -7 +7 @@
 *            Please read README for more information
 */
-
-#include <cstring>
 
 #include "../../shared/shared.h"

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -7 +7 @@
 *            Please read README for more information
 */
-
-#include <cstring>
 
 #include "../../shared/shared.h"
@@ -262 +260 @@
               else if (strcmp(name,"Input")==0) return InputEnum;
               else if (strcmp(name,"IntInput")==0) return IntInputEnum;
-              else if (strcmp(name,"IntParam")==0) return IntParamEnum;
-              else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
-              else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
+              if (strcmp(name,"IntParam")==0) return IntParamEnum;
+              else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
               else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum;
               else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum;
@@ -387 +383 @@
               else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
               else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
-              else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
-              else if (strcmp(name,"P0")==0) return P0Enum;
-              else if (strcmp(name,"P1")==0) return P1Enum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"P1DG")==0) return P1DGEnum;
+              if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
+              else if (strcmp(name,"P0")==0) return P0Enum;
+              else if (strcmp(name,"P1")==0) return P1Enum;
+              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
               else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
               else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;

issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=437;
+macro=440;