Add original file g5k.xml.

[loba.git] / hostdata.cpp

diff --git a/hostdata.cpp b/hostdata.cpp
index 17d7a0816a3ae62603637e4935ecfd3d2ddcf09d..403e13c3ee710cc19626f2ba8e0aefdd358b3248 100644 (file)
--- a/hostdata.cpp
+++ b/hostdata.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 #include <cstring>
-#include <tr1/functional>
+#include <functional>
 #include <stdexcept>
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
@@ -16,18 +16,24 @@ std::vector<hostdata> hostdata::hosts;
 
 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;
 
+#if SIMGRID_VERSION < MAKE_SIMGRID_VERSION(3, 7, 0)
     int nhosts = MSG_get_host_number();
-    m_host_t* host_list = MSG_get_host_table();
+    msg_host_t* host_list = MSG_get_host_table();
+#else // API changed with SG 3.7.0
+    xbt_dynar_t host_dynar = MSG_hosts_as_dynar();
+    int nhosts = xbt_dynar_length(host_dynar);
+    msg_host_t* host_list = static_cast<msg_host_t*>(xbt_dynar_to_array(host_dynar));
+#endif
     // 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);
 
@@ -45,7 +51,7 @@ void hostdata::destroy()
     // hosts are automatically destroyed...
 }
 
-hostdata::hostdata(m_host_t host)
+hostdata::hostdata(msg_host_t host)
     : name(MSG_host_get_name(host))
     , ctrl_mbox(std::string(name) + "_ctrl")
     , data_mbox(std::string(name) + "_data")