X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/c86e5ff42db3495538c8b48cb7ea0943a13702b7..7aedebde4d8de8a7b9f0d3ba2dc38f968c739569:/hostdata.cpp diff --git a/hostdata.cpp b/hostdata.cpp index 4d71054..17d7a08 100644 --- a/hostdata.cpp +++ b/hostdata.cpp @@ -1,5 +1,6 @@ -#include #include +#include +#include #include #include #include @@ -13,30 +14,27 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); std::vector hostdata::hosts; -// used to compare m_host_t's by name -struct hostdata::m_host_less { - bool operator()(const m_host_t& a, const m_host_t& b) - { - const char* na = MSG_host_get_name(a); - const char* nb = MSG_host_get_name(b); - return strcmp(na, nb) < 0; - } -}; - void hostdata::create() { + using std::tr1::bind; + using std::tr1::placeholders::_1; + using std::tr1::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, m_host_less()); + std::sort(host_list, host_list + nhosts, + bind(std::less(), bind(strcmp, + bind(MSG_host_get_name, _1), + bind(MSG_host_get_name, _2)), 0)); hosts.assign(host_list, host_list + nhosts); xbt_free(host_list); e_xbt_log_priority_t logp = xbt_log_priority_verbose; if (!LOG_ISENABLED(logp)) return; - XBT_LOG(logp, "Got %lu hosts.", (unsigned long)hosts.size()); + XBT_LOG(logp, "Got %zu hosts.", hosts.size()); for (int i = 0; i < nhosts; i++) { XBT_LOG(logp, "Host #%d named \"%s\".", i, hosts[i].get_name()); }