replace 'std::random_shuffle' by '::random_shuffle'.

Signed-off-by: Daniela Engert <dani@ngrt.de>
This commit is contained in:
Daniela Engert
2016-08-18 18:55:33 +02:00
parent 135e598bc4
commit b2ed4b4521
2 changed files with 8 additions and 6 deletions

View File

@@ -19,6 +19,7 @@
#include <boost/timer/timer.hpp>
#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]++;
}

View File

@@ -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]++;
}