From b2ed4b4521fea6442403129c4dec65763a7eb7a4 Mon Sep 17 00:00:00 2001 From: Daniela Engert Date: Thu, 18 Aug 2016 18:55:33 +0200 Subject: [PATCH] replace 'std::random_shuffle' by '::random_shuffle'. Signed-off-by: Daniela Engert --- test/bench_merge.cpp | 7 ++++--- test/bench_sort.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/test/bench_merge.cpp b/test/bench_merge.cpp index 26a84f0..5fe13f4 100644 --- a/test/bench_merge.cpp +++ b/test/bench_merge.cpp @@ -19,6 +19,7 @@ #include #include "order_type.hpp" +#include "random_shuffle.hpp" using boost::timer::cpu_timer; using boost::timer::cpu_times; @@ -45,9 +46,9 @@ std::size_t generate_elements(T elements[], std::size_t element_count, std::size std::size_t key = key_len ? (i % key_len) : i; elements[i].key=key; } - std::random_shuffle(elements, elements + element_count); - std::random_shuffle(elements, elements + element_count); - std::random_shuffle(elements, elements + element_count); + ::random_shuffle(elements, elements + element_count); + ::random_shuffle(elements, elements + element_count); + ::random_shuffle(elements, elements + element_count); for(std::size_t i = 0; i < element_count; ++i){ elements[i].val = key_reps[elements[i].key]++; } diff --git a/test/bench_sort.cpp b/test/bench_sort.cpp index b67522a..abfa13a 100644 --- a/test/bench_sort.cpp +++ b/test/bench_sort.cpp @@ -24,6 +24,7 @@ using boost::timer::cpu_times; using boost::timer::nanosecond_type; #include "order_type.hpp" +#include "random_shuffle.hpp" //#define BOOST_MOVE_ADAPTIVE_SORT_STATS //#define BOOST_MOVE_ADAPTIVE_SORT_INVARIANTS @@ -48,9 +49,9 @@ void generate_elements(T elements[], std::size_t element_count, std::size_t key_ std::size_t key = key_len ? (i % key_len) : i; elements[i].key=key; } - std::random_shuffle(elements, elements + element_count); - std::random_shuffle(elements, elements + element_count); - std::random_shuffle(elements, elements + element_count); + ::random_shuffle(elements, elements + element_count); + ::random_shuffle(elements, elements + element_count); + ::random_shuffle(elements, elements + element_count); for(std::size_t i = 0; i < element_count; ++i){ elements[i].val = key_reps[elements[i].key]++; }