popping_enum.h becomes an hpp.

diff --git a/MANIFEST.in b/MANIFEST.in
index 458cde8..b61988d 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2389,7 +2389,7 @@ include src/simix/libsmx.cpp
 include src/simix/popping.cpp
 include src/simix/popping_accessors.hpp
 include src/simix/popping_bodies.cpp
-include src/simix/popping_enum.h
+include src/simix/popping_enum.hpp
 include src/simix/popping_generated.cpp
 include src/simix/popping_private.hpp
 include src/simix/simcalls.in

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 0efc6f8..b4146bb 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -743,7 +743,7 @@ EXCLUDE_PATTERNS += @CMAKE_HOME_DIRECTORY@/src/xbt/automaton/parserPromela.*
 EXCLUDE_PATTERNS += @CMAKE_HOME_DIRECTORY@/src/bindings/java/*.cpp @CMAKE_HOME_DIRECTORY@/src/bindings/java/*.h
 EXCLUDE_PATTERNS += @CMAKE_HOME_DIRECTORY@/src/simix/popping_accessors.hpp \
                     @CMAKE_HOME_DIRECTORY@/src/simix/popping_bodies.cpp    \
-                    @CMAKE_HOME_DIRECTORY@/src/simix/popping_enum.h        \
+                    @CMAKE_HOME_DIRECTORY@/src/simix/popping_enum.hpp      \
                     @CMAKE_HOME_DIRECTORY@/src/simix/popping_generated.cpp
 
 

diff --git a/doc/doxygen/inside_extending.doc b/doc/doxygen/inside_extending.doc
index 1a7f221..83c934e 100644 (file)
--- a/doc/doxygen/inside_extending.doc
+++ b/doc/doxygen/inside_extending.doc
@@ -164,7 +164,7 @@ generates the following files:
   Helper functions to get and set simcall arguments and results
 - popping_bodies.cpp:
   The BODY function of each simcall
-- popping_enum.h:
+- popping_enum.hpp:
   Definition of type `enum e_smx_simcall_t` (one value per existing simcall)
 - popping_generated.cpp:
   Definitions of `simcall_names[]` (debug name of each simcall), and

diff --git a/src/simix/popping_enum.h b/src/simix/popping_enum.hpp
similarity index 97%
rename from src/simix/popping_enum.h
rename to src/simix/popping_enum.hpp
index 0d3b7a6..0742c80 100644 (file)
--- a/src/simix/popping_enum.h
+++ b/src/simix/popping_enum.hpp
@@ -17,7 +17,7 @@
 /**
  * @brief All possible simcalls.
  */
-typedef enum {
+enum e_smx_simcall_t {
   SIMCALL_NONE,
   SIMCALL_EXECUTION_WAITANY_FOR,
   SIMCALL_COMM_SEND,
@@ -39,4 +39,4 @@ typedef enum {
   SIMCALL_RUN_KERNEL,
   SIMCALL_RUN_BLOCKING,
   NUM_SIMCALLS
-} e_smx_simcall_t;
+};

diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp
index 4b3ad06..e78caf9 100644 (file)
--- a/src/simix/popping_private.hpp
+++ b/src/simix/popping_private.hpp
@@ -12,7 +12,7 @@
 #include <boost/intrusive_ptr.hpp>
 
 /********************************* Simcalls *********************************/
-#include "popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */
+#include "popping_enum.hpp" /* Definition of e_smx_simcall_t, with one value per simcall */
 
 XBT_PUBLIC_DATA const char* simcall_names[]; /* Name of each simcall */
 

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 5b0f872..ab7f57a 100755 (executable)
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -292,19 +292,19 @@ if __name__ == '__main__':
     fd.close()
 
     #
-    # popping_enum.h
+    # popping_enum.hpp
     #
-    fd = header("popping_enum.h")
+    fd = header("popping_enum.hpp")
     fd.write('/**\n')
     fd.write(' * @brief All possible simcalls.\n')
     fd.write(' */\n')
-    fd.write('typedef enum {\n')
+    fd.write('enum e_smx_simcall_t {\n')
     fd.write('  SIMCALL_NONE,\n')
 
     handle(fd, Simcall.enum, simcalls, simcalls_dict)
 
     fd.write('  NUM_SIMCALLS\n')
-    fd.write('} e_smx_simcall_t;\n')
+    fd.write('};\n')
     fd.close()
 
     #

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index c07a6b5..ae1d4b5 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -24,7 +24,7 @@ set(EXTRA_DIST
   src/simix/popping_private.hpp
   src/simix/popping_bodies.cpp
   src/simix/popping_generated.cpp
-  src/simix/popping_enum.h
+  src/simix/popping_enum.hpp
   src/simix/popping_accessors.hpp
   src/simix/smx_private.hpp
   src/smpi/colls/coll_tuned_topo.hpp

diff --git a/tools/cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake
index f1be39c..8bf37e7 100644 (file)
--- a/tools/cmake/MaintainerMode.cmake
+++ b/tools/cmake/MaintainerMode.cmake
@@ -15,7 +15,7 @@ if(enable_maintainer_mode AND NOT WIN32)
       OUTPUT
       ${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp
       ${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp
-      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h
+      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.hpp
       ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp
 
       DEPENDS
@@ -31,12 +31,12 @@ if(enable_maintainer_mode AND NOT WIN32)
       DEPENDS
       ${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp
       ${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp
-      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h
+      ${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.hpp
       ${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp
       )
 
     SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
-      "${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.h;${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp"
+      "${CMAKE_HOME_DIRECTORY}/src/simix/popping_enum.hpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_generated.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_bodies.cpp;${CMAKE_HOME_DIRECTORY}/src/simix/popping_accessors.hpp"
       )
   endif()
 endif()