Replace NULL with nullptr.

[loba.git] / messages.h

diff --git a/messages.h b/messages.h
index cc6efbc2b5cf5e0898e90e95d5783e30fc45991c..02859c975c05089442b8182b65978454ca1bf4e3 100644 (file)
--- a/messages.h
+++ b/messages.h
@@ -3,14 +3,14 @@
 
 #include <queue>
 #include <string>
 
 #include <queue>
 #include <string>

-#include <msg/msg.h>
+#include <simgrid/msg.h>

 #include "simgrid_features.h"
 #include "synchro.h"
 #include "sync_queue.h"
 
 class message {
 public:
 #include "simgrid_features.h"
 #include "synchro.h"
 #include "sync_queue.h"
 
 class message {
 public:

-    enum message_type { CTRL, DATA, CTRL_CLOSE, DATA_CLOSE };
+    enum class message_type { CTRL, DATA, CTRL_CLOSE, DATA_CLOSE };

 
     message(message_type t, double a, double c = 0.0);
 
 
     message(message_type t, double a, double c = 0.0);