Sonar: dont't duplicate declarations.

[simgrid.git] / include / xbt / replay.hpp

diff --git a/include/xbt/replay.hpp b/include/xbt/replay.hpp
index de1fbc5..0658148 100644 (file)
--- a/include/xbt/replay.hpp
+++ b/include/xbt/replay.hpp
@@ -10,8 +10,8 @@
 
 #include <xbt/misc.h> /* SG_BEGIN_DECL */
 
-#ifdef __cplusplus
 #include <fstream>
+#include <functional>
 #include <queue>
 #include <unordered_map>
 
@@ -19,20 +19,14 @@ namespace simgrid {
 namespace xbt {
 /* To split the file if a unique one is given (specific variable for the other case live in runner()) */
 typedef std::vector<std::string> ReplayAction;
-static std::unordered_map<std::string, std::queue<ReplayAction*>*> action_queues;
 
 XBT_PUBLIC_DATA std::ifstream* action_fs;
 XBT_PUBLIC int replay_runner(int argc, char* argv[]);
 }
 }
-#endif
-
-SG_BEGIN_DECL()
 
-typedef void (*action_fun)(const char* const* args);
+typedef std::function<void(simgrid::xbt::ReplayAction&)> action_fun;
 XBT_PUBLIC void xbt_replay_action_register(const char* action_name, action_fun function);
 XBT_PUBLIC action_fun xbt_replay_action_get(const char* action_name);
 
-SG_END_DECL()
-
 #endif