X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/751ae9fcfc70b0b48670338c2273e2eaebc388d2..131a59f87a95e3a3dc7a3cdb4f06fbcb66e826b3:/hostdata.cpp?ds=sidebyside diff --git a/hostdata.cpp b/hostdata.cpp index 787b7ab..ee8fadc 100644 --- a/hostdata.cpp +++ b/hostdata.cpp @@ -1,5 +1,6 @@ -#include <cstring> #include <algorithm> +#include <cstring> +#include <functional> #include <stdexcept> #include <xbt/log.h> #include <xbt/sysdep.h> @@ -13,23 +14,20 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); std::vector<hostdata> 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::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, m_host_less()); + 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)); hosts.assign(host_list, host_list + nhosts); xbt_free(host_list);