Convert clock_type to enum class.

[loba.git] / hostdata.cpp

diff --git a/hostdata.cpp b/hostdata.cpp
index 5498ba8ad64127573f17748446880bbef4719e9e..be62d4d83129d252bb3edb35ac4e951bf53c8190 100644 (file)
--- a/hostdata.cpp
+++ b/hostdata.cpp
@@ -1,6 +1,5 @@
 #include <algorithm>
 #include <cstring>
 #include <algorithm>
 #include <cstring>

-#include <functional>

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


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

-    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();
-#else // API changed with SG 3.7.0

     xbt_dynar_t host_dynar = MSG_hosts_as_dynar();
     int nhosts = xbt_dynar_length(host_dynar);
     xbt_dynar_t host_dynar = MSG_hosts_as_dynar();
     int nhosts = xbt_dynar_length(host_dynar);

-    m_host_t* host_list = static_cast<m_host_t*>(xbt_dynar_to_array(host_dynar));
-#endif
+    msg_host_t* host_list = static_cast<msg_host_t*>(xbt_dynar_to_array(host_dynar));

     // only sort hosts for automatically created deployment
     if (opt::auto_depl::enabled)
         std::sort(host_list, host_list + nhosts,
     // only sort hosts for automatically created deployment
     if (opt::auto_depl::enabled)
         std::sort(host_list, host_list + nhosts,

-                  std::bind(std::less<int>(),
-                            std::bind(strcmp,
-                                      std::bind(MSG_host_get_name, _1),
-                                      std::bind(MSG_host_get_name, _2)), 0));
+                  [](msg_host_t a, msg_host_t b) {
+                      return std::strcmp(MSG_host_get_name(a), MSG_host_get_name(b)) < 0;
+                  });

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


@@ -51,7 +41,7 @@ void hostdata::destroy()
     // hosts are automatically destroyed...
 }
 
     // 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")
     : name(MSG_host_get_name(host))
     , ctrl_mbox(std::string(name) + "_ctrl")
     , data_mbox(std::string(name) + "_data")