X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd0269d32f2c27ff9b74ec7890caea1fdff55b50..533b09bd161a7a8bef036a14bbcb8793286b9d9f:/src/msg/msg_actions.cpp?ds=sidebyside

diff --git a/src/msg/msg_actions.cpp b/src/msg/msg_actions.cpp
index 916aa87422..82619ee002 100644
--- a/src/msg/msg_actions.cpp
+++ b/src/msg/msg_actions.cpp
@@ -1,26 +1,25 @@
-/* Copyright (c) 2009-2015. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.hpp"
 #include "xbt/replay.hpp"
 
-#include <errno.h>
+#include <cerrno>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_action, msg, "MSG actions for trace driven simulation");
 
-SG_BEGIN_DECL()
+extern "C" {
 
 void MSG_action_init()
 {
-  simgrid::xbt::replay_init();
   MSG_function_register_default(simgrid::xbt::replay_runner);
 }
 
 void MSG_action_exit()
 {
-  simgrid::xbt::replay_exit();
+  // Nothing to do anymore here
 }
 
 /** \ingroup msg_trace_driven
@@ -37,11 +36,11 @@ msg_error_t MSG_action_trace_run(char *path)
 
   msg_error_t res = MSG_main();
 
-  if (!simgrid::xbt::action_queues.empty()) {
+  if (not simgrid::xbt::action_queues.empty()) {
     XBT_WARN("Not all actions got consumed. If the simulation ended successfully (without deadlock),"
              " you may want to add new processes to your deployment file.");
 
-    for (auto actions_of : simgrid::xbt::action_queues) {
+    for (auto const& actions_of : simgrid::xbt::action_queues) {
       XBT_WARN("Still %zu actions for %s", actions_of.second->size(), actions_of.first.c_str());
     }
   }
@@ -53,5 +52,4 @@ msg_error_t MSG_action_trace_run(char *path)
 
   return res;
 }
-
-SG_END_DECL()
+}