Use tr1/functional for sorting the hosts.

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

 #include <algorithm>
 #include <algorithm>

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

 #include <stdexcept>
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
 #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;
 
 
 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()
 {
 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)
     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<int>(), 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);
 
     hosts.assign(host_list, host_list + nhosts);
     xbt_free(host_list);
 

diff --git a/hostdata.h b/hostdata.h
index 703b7a1b38410f158912ea1a22993c31759c26e8..722b2bcdc87340095edb6ce7bb669fec8c6f6a95 100644 (file)
--- a/hostdata.h
+++ b/hostdata.h
@@ -25,7 +25,6 @@ public:
 private:
     // static list of hostdata's, used by create/destroy
     static std::vector<hostdata> hosts;
 private:
     // static list of hostdata's, used by create/destroy
     static std::vector<hostdata> hosts;

-    struct m_host_less;

 
     const char* name;
     std::string ctrl_mbox;
 
     const char* name;
     std::string ctrl_mbox;