Fix missing definition in gcc 4.4/cstdatomic.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index bd0cb7b7a6ba0db14dd2a5741ad53994ae7a5f3e..e6a47b4a81e3d7e7ec9662e753982931fb5674e2 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
 #include <algorithm>

-#include <tr1/functional>
+#include <functional>

 #include <msg/msg.h>
 #include <xbt/log.h>
 
 #include <msg/msg.h>
 #include <xbt/log.h>
 


@@ -24,9 +24,8 @@ namespace {
 communicator::communicator()
     : host(static_cast<hostdata*>(MSG_host_get_data(MSG_host_self())))
 {
 communicator::communicator()
     : host(static_cast<hostdata*>(MSG_host_get_data(MSG_host_self())))
 {

-    using std::tr1::bind;

     receiver_thread = new_msg_thread("receiver",
     receiver_thread = new_msg_thread("receiver",

-                                     bind(&communicator::receiver, this));
+                                     std::bind(&communicator::receiver, this));

     receiver_thread->start();
 }
 
     receiver_thread->start();
 }
 


@@ -73,8 +72,7 @@ void communicator::real_flush(sent_comm_type& sent_comm, bool wait)
         std::copy(sent_comm.begin(), sent_comm.end(), comms);
         sent_comm.clear();
         MSG_comm_waitall(comms, size, -1.0);
         std::copy(sent_comm.begin(), sent_comm.end(), comms);
         sent_comm.clear();
         MSG_comm_waitall(comms, size, -1.0);

-        if (!MSG_WAIT_DESTROYS_COMMS)
-            std::for_each(comms, comms + size, comm_check_n_destroy);
+        std::for_each(comms, comms + size, comm_check_n_destroy);

         delete[] comms;
     }
 }
         delete[] comms;
     }
 }