It is useless to mention "tr1", now that compilation is done with -std=c++0x.

[loba.git] / hostdata.cpp

diff --git a/hostdata.cpp b/hostdata.cpp
index 17d7a0816a3ae62603637e4935ecfd3d2ddcf09d..ee8fadce107447fa32c0a3e7da307130ac89758f 100644 (file)
--- a/hostdata.cpp
+++ b/hostdata.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 #include <cstring>
 #include <algorithm>
 #include <cstring>

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

 #include <stdexcept>
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
 #include <stdexcept>
 #include <xbt/log.h>
 #include <xbt/sysdep.h>


@@ -16,18 +16,18 @@ std::vector<hostdata> hostdata::hosts;
 
 void hostdata::create()
 {
 
 void hostdata::create()
 {

-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
-    using std::tr1::placeholders::_2;
+    using std::placeholders::_1;
+    using std::placeholders::_2;

 
     int nhosts = MSG_get_host_number();
     m_host_t* host_list = MSG_get_host_table();
     // only sort hosts for automatically created deployment
     if (opt::auto_depl::enabled)
         std::sort(host_list, host_list + nhosts,
 
     int nhosts = MSG_get_host_number();
     m_host_t* host_list = MSG_get_host_table();
     // only sort hosts for automatically created deployment
     if (opt::auto_depl::enabled)
         std::sort(host_list, host_list + nhosts,

-                  bind(std::less<int>(), bind(strcmp,
-                                              bind(MSG_host_get_name, _1),
-                                              bind(MSG_host_get_name, _2)), 0));
+                  std::bind(std::less<int>(),
+                            std::bind(strcmp,
+                                      std::bind(MSG_host_get_name, _1),
+                                      std::bind(MSG_host_get_name, _2)), 0));

     hosts.assign(host_list, host_list + nhosts);
     xbt_free(host_list);
 
     hosts.assign(host_list, host_list + nhosts);
     xbt_free(host_list);