Changeset 14958

Timestamp:

05/08/13 10:22:31 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moved StringToEnumx and EnumToStringx to shared/Enum

Location:

issm/trunk-jpl/src/c

Files:

• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• modules/EnumToStringx (deleted)
• modules/StringToEnumx (deleted)
• modules/modules.h (modified) (1 diff)
• shared/Enum (added)
• shared/Enum/EnumToStringx.cpp (copied) (copied from issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp ) (1 diff)
• shared/Enum/EnumToStringx.h (copied) (copied from issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.h )
• shared/Enum/StringToEnumx.cpp (copied) (copied from issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp ) (1 diff)
• shared/Enum/StringToEnumx.h (copied) (copied from issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.h )
• shared/shared.h (modified) (1 diff)

issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

@@ -7 +7 @@
 #define _ENUM_DEFINITIONS_
 
-#include "../modules/EnumToStringx/EnumToStringx.h"
-#include "../modules/StringToEnumx/StringToEnumx.h"
+#include "../shared/Enum/EnumToStringx.h"
+#include "../shared/Enum/StringToEnumx.h"
 
 enum definitions{

issm/trunk-jpl/src/c/Makefile.am

@@ -191 +191 @@
                                         ./shared/io/Comm/IssmComm.h\
                                         ./shared/io/Comm/IssmComm.cpp\
+                                        ./shared/Enum/EnumToStringx.cpp\
+                                        ./shared/Enum/EnumToStringx.h\
+                                        ./shared/Enum/StringToEnumx.cpp\
+                                        ./shared/Enum/StringToEnumx.h\
                                         ./shared/Numerics/numerics.h\
                                         ./shared/Numerics/types.h\
@@ -305 +309 @@
                                         ./modules/Reduceloadx/Reduceloadx.h\
                                         ./modules/Reduceloadx/Reduceloadx.cpp\
-                                        ./modules/EnumToStringx/EnumToStringx.cpp\
-                                        ./modules/EnumToStringx/EnumToStringx.h\
-                                        ./modules/StringToEnumx/StringToEnumx.cpp\
-                                        ./modules/StringToEnumx/StringToEnumx.h\
                                         ./modules/ConstraintsStatex/ConstraintsStatex.cpp\
                                         ./modules/ConstraintsStatex/ConstraintsStatex.h\

issm/trunk-jpl/src/c/modules/modules.h

@@ -26 +26 @@
 #include "./ElementConnectivityx/ElementConnectivityx.h"
 #include "./EdgeDetectionx/EdgeDetectionx.h"
-#include "./EnumToStringx/EnumToStringx.h"
-#include "./StringToEnumx/StringToEnumx.h"
 #include "./GetSolutionFromInputsx/GetSolutionFromInputsx.h"
 #include "./GetVectorFromInputsx/GetVectorFromInputsx.h"

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

@@ -9 +9 @@
 
 #include <cstring>
-#include "../../shared/shared.h"
 #include "./EnumToStringx.h"
+#include "../Exceptions/exceptions.h"
+#include "../MemOps/MemOps.h"
+#include "../../EnumDefinitions/EnumDefinitions.h"
 
 const char* EnumToStringx(int en){

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

@@ -9 +9 @@
 
 #include <cstring>
-#include "../../shared/shared.h"
 #include "./StringToEnumx.h"
+#include "../Exceptions/exceptions.h"
+#include "../../EnumDefinitions/EnumDefinitions.h"
 
 int  StringToEnumx(const char* name){

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

@@ -9 +9 @@
 #include "./Bamg/shared.h"
 #include "./Elements/elements.h"
+#include "./Enum/EnumToStringx.h"
+#include "./Enum/StringToEnumx.h"
 #include "./Exceptions/exceptions.h"
 #include "./Exp/exp.h"