API change in SimGrid 3.8: MSG_global_init -> MSG_init.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index 867d19eb36f1575345569c04fb772e8986be085b..2ba91a01583ff498df543e571ec46f568b221cce 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,12 +1,11 @@
 #include <algorithm>
-#include <tr1/functional>
+#include <functional>
 #include <msg/msg.h>
 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"
-#include "simgrid_features.h"
 #include "tracing.h"
 
 #include "communicator.h"
@@ -24,9 +23,8 @@ namespace {
 communicator::communicator()
     : host(static_cast<hostdata*>(MSG_host_get_data(MSG_host_self())))
 {
-    using std::tr1::bind;
     receiver_thread = new_msg_thread("receiver",
-                                     bind(&communicator::receiver, this));
+                                     std::bind(&communicator::receiver, this));
     receiver_thread->start();
 }
 
@@ -55,9 +53,9 @@ msg_comm_t communicator::real_send(const char* dest, message* msg)
 {
     XBT_DEBUG("send %s to %s", msg->to_string().c_str(), dest);
     m_task_t task = MSG_task_create("message", 0.0, msg->get_size(), msg);
-    TRACE_msg_set_task_category(task,
-                                msg->get_type() == message::LOAD ?
-                                TRACE_CAT_DATA : TRACE_CAT_CTRL);
+    // MSG_task_set_category(task,
+    //                       msg->get_type() == message::DATA ?
+    //                       TRACE_CAT_DATA : TRACE_CAT_CTRL);
     return MSG_task_isend(task, dest);
 }