Add a lock-free synchronized queue.

[loba.git] / process.h

diff --git a/process.h b/process.h
index ed6e6cf6fbedffc1ab96657aadda320828ca0a2a..4686af4a3f75f358f00769050546ccaa82e0cdbc 100644 (file)
--- a/process.h
+++ b/process.h
@@ -5,10 +5,10 @@
 //#undef USE_UNORDERED_MAP
 
 #include <algorithm>
 //#undef USE_UNORDERED_MAP
 
 #include <algorithm>

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

 #ifdef USE_UNORDERED_MAP
 #ifdef USE_UNORDERED_MAP

-#  include <tr1/unordered_map>
-#  define MAP_TEMPLATE std::tr1::unordered_map
+#  include <unordered_map>
+#  define MAP_TEMPLATE std::unordered_map

 #else
 #  include <map>
 #  define MAP_TEMPLATE std::map
 #else
 #  include <map>
 #  define MAP_TEMPLATE std::map


@@ -169,13 +169,12 @@ private:
 template <typename Compare>
 void process::pneigh_sort_by_load(const Compare& comp)
 {
 template <typename Compare>
 void process::pneigh_sort_by_load(const Compare& comp)
 {

-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
-    using std::tr1::placeholders::_2;
+    using std::placeholders::_1;
+    using std::placeholders::_2;

     std::sort(pneigh.begin(), pneigh.end(),
     std::sort(pneigh.begin(), pneigh.end(),

-              bind(comp,
-                   bind(&neighbor::get_load, _1),
-                   bind(&neighbor::get_load, _2)));
+              std::bind(comp,
+                        std::bind(&neighbor::get_load, _1),
+                        std::bind(&neighbor::get_load, _2)));

 }
 
 #endif // !PROCESS_H
 }
 
 #endif // !PROCESS_H