diff --git a/benchmark/run.cpp b/benchmark/run.cpp index 38612f55d..658df8adf 100644 --- a/benchmark/run.cpp +++ b/benchmark/run.cpp @@ -410,14 +410,11 @@ struct test8 #include -#if BOOST_VERSION >= 105300 -//#include -//#include - class rule_cache_move { private: - BOOST_MOVABLE_BUT_NOT_COPYABLE(rule_cache_move) + rule_cache_move(rule_cache_move const& other) = delete; // no copy ctor + rule_cache_move& operator=(rule_cache_move const& other) = delete; // no assignment op public: typedef std::vector rule_ptrs; rule_cache_move() @@ -425,13 +422,13 @@ public: else_rules_(), also_rules_() {} - rule_cache_move(BOOST_RV_REF(rule_cache_move) rhs) // move ctor - : if_rules_(boost::move(rhs.if_rules_)), - else_rules_(boost::move(rhs.else_rules_)), - also_rules_(boost::move(rhs.also_rules_)) + rule_cache_move(rule_cache_move && rhs) // move ctor + : if_rules_(std::move(rhs.if_rules_)), + else_rules_(std::move(rhs.else_rules_)), + also_rules_(std::move(rhs.also_rules_)) {} - rule_cache_move& operator=(BOOST_RV_REF(rule_cache_move) rhs) // move assign + rule_cache_move& operator=(rule_cache_move && rhs) // move assign { std::swap(if_rules_, rhs.if_rules_); std::swap(else_rules_,rhs.else_rules_); @@ -491,9 +488,11 @@ struct test9 threads_(threads), num_rules_(num_rules), num_styles_(num_styles), - rules_() { + rules_() + { mapnik::rule r("test"); - for (unsigned i=0;i rule_caches; - for (unsigned i=0;i rule_caches; + for (unsigned i=0;i= 105300 test9 runner(1000,10,200,50); - benchmark(runner,"rule caching using boost::move"); + benchmark(runner,"rule caching using move semantics"); #else - std::clog << "not running: 'rule caching using boost::move'\n"; + std::clog << "not running: 'rule caching using move semantics'\n"; #endif }