fix

[simgrid.git] / src / msg / msg_actions.cpp

diff --git a/src/msg/msg_actions.cpp b/src/msg/msg_actions.cpp
index 1fd0b41..944d9e3 100644 (file)
--- a/src/msg/msg_actions.cpp
+++ b/src/msg/msg_actions.cpp
@@ -1,17 +1,17 @@
-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-2015. 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 "msg_private.h"
-#include "xbt/dynar.h"
+#include "src/msg/msg_private.h"
 #include "xbt/replay.h"
 
 #include <errno.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_action, msg, "MSG actions for trace driven simulation");
 
+SG_BEGIN_DECL()
+
 void MSG_action_init()
 {
   _xbt_replay_action_init();
@@ -26,7 +26,7 @@ void MSG_action_exit()
 /** \ingroup msg_trace_driven
  * \brief A trace loader
  *
- *  If path!=NULL, load a trace file containing actions, and execute them.
+ *  If path!=nullptr, load a trace file containing actions, and execute them.
  *  Else, assume that each process gets the path in its deployment file
  */
 msg_error_t MSG_action_trace_run(char *path)
@@ -36,10 +36,10 @@ msg_error_t MSG_action_trace_run(char *path)
   xbt_dynar_t todo;
   xbt_dict_cursor_t cursor;
 
-  xbt_action_fp=NULL;
+  xbt_action_fp=nullptr;
   if (path) {
     xbt_action_fp = fopen(path, "r");
-    xbt_assert(xbt_action_fp != NULL, "Cannot open %s: %s", path, strerror(errno));
+    xbt_assert(xbt_action_fp != nullptr, "Cannot open %s: %s", path, strerror(errno));
   }
   res = MSG_main();
 
@@ -55,7 +55,9 @@ msg_error_t MSG_action_trace_run(char *path)
   if (path)
     fclose(xbt_action_fp);
   xbt_dict_free(&xbt_action_queues);
-  xbt_action_queues = xbt_dict_new_homogeneous(NULL);
+  xbt_action_queues = xbt_dict_new_homogeneous(nullptr);
 
   return res;
 }
+
+SG_END_DECL()