Replace NULL with nullptr.

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index b79210ca7d78dfb365bf276d7788c7f8316b2140..c123b1b5466e2f1448474bf3e899c0beb7ae7296 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -4,10 +4,11 @@
 #define COMMUNICATOR_H
 
 #include <vector>
 #define COMMUNICATOR_H
 
 #include <vector>

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

 #include "hostdata.h"
 #include "messages.h"
 #include "msg_thread.h"
 #include "hostdata.h"
 #include "messages.h"
 #include "msg_thread.h"

+#include "simgrid_features.h"

 
 class communicator {
 public:
 
 class communicator {
 public:


@@ -37,10 +38,10 @@ public:
     // Try to get a message.  Returns true on success.
     // Parameter "timeout" may be 0 for non-blocking operation, -1 for
     // infinite waiting, or any positive timeout.
     // Try to get a message.  Returns true on success.
     // Parameter "timeout" may be 0 for non-blocking operation, -1 for
     // infinite waiting, or any positive timeout.

-    bool ctrl_recv(message*& msg, m_host_t& from, double timeout) {
+    bool ctrl_recv(message*& msg, msg_host_t& from, double timeout) {

         return ctrl_received.pop(msg, from, timeout);
     }
         return ctrl_received.pop(msg, from, timeout);
     }

-    bool data_recv(message*& msg, m_host_t& from, double timeout) {
+    bool data_recv(message*& msg, msg_host_t& from, double timeout) {

         return data_received.pop(msg, from, timeout);
     }
 
         return data_received.pop(msg, from, timeout);
     }