X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/7154ea8a74d7566156c7e65034fdbad45d230cf5..c5a7539afc8ed6dc082772476fe3f74f2fa67e24:/process.h?ds=sidebyside diff --git a/process.h b/process.h index ed6e6cf..4686af4 100644 --- a/process.h +++ b/process.h @@ -5,10 +5,10 @@ //#undef USE_UNORDERED_MAP #include -#include +#include #ifdef USE_UNORDERED_MAP -# include -# define MAP_TEMPLATE std::tr1::unordered_map +# include +# define MAP_TEMPLATE std::unordered_map #else # include # define MAP_TEMPLATE std::map @@ -169,13 +169,12 @@ private: template 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(), - 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