X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/bccf459a375af533649be3e8036f5040769cd594..20ee10ed13aee7d9fb9c844648d5159ed4a054d2:/process.h?ds=sidebyside

diff --git a/process.h b/process.h
index 25d6c44..f01c3c6 100644
--- a/process.h
+++ b/process.h
@@ -1,22 +1,12 @@
 #ifndef PROCESS_H
 #define PROCESS_H
 
-#define USE_UNORDERED_MAP 1
-//#undef USE_UNORDERED_MAP
-
 #include <algorithm>
-#include <functional>
-#ifdef USE_UNORDERED_MAP
-#  include <unordered_map>
-#  define MAP_TEMPLATE std::unordered_map
-#else
-#  include <map>
-#  define MAP_TEMPLATE std::map
-#endif
+#include <atomic>
+#include <unordered_map>
 #include <vector>
-#include <msg/msg.h>
+#include <simgrid/msg.h>
 #include <xbt/log.h>
-#include "atomic_compat.h"
 #include "communicator.h"
 #include "misc.h"
 #include "msg_thread.h"
@@ -103,7 +93,7 @@ private:
 
     static std::atomic<int> convergence_counter;
 
-    typedef MAP_TEMPLATE<msg_host_t, neighbor*> rev_neigh_type;
+    typedef std::unordered_map<msg_host_t, neighbor*> rev_neigh_type;
     neigh_type neigh;           // list of neighbors (do not alter
                                 // after construction!)
     rev_neigh_type rev_neigh;   // map msg_host_t -> neighbor
@@ -205,12 +195,10 @@ private:
 template <typename Compare>
 void process::pneigh_sort_by_load(const Compare& comp)
 {
-    using std::placeholders::_1;
-    using std::placeholders::_2;
     std::sort(pneigh.begin(), pneigh.end(),
-              std::bind(comp,
-                        std::bind(&neighbor::get_load, _1),
-                        std::bind(&neighbor::get_load, _2)));
+              [&comp](const neighbor* a, const neighbor* b) {
+                  return comp(a->get_load(), b->get_load());
+              });
 }
 
 #endif // !PROCESS_H