feedc0de/boost_algorithm
1
0
Fork 0
forked from boostorg/algorithm
Code Pull Requests Activity

Conditionally replace deprecated c++98 features by c++11 ones

Browse Source 
change std::random_shuffle -> std::shuffle + random_engine if indicated by the supported language level or Boost configuration macro.

Signed-off-by: Daniela Engert <dani@ngrt.de>
This commit is contained in:
Daniela Engert
2017-04-22 17:13:39 +02:00
parent f14719c3a9
commit 8ae18ae455
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
minmax/test/minmax_element_test.cpp
View File

@@ -20,6 +20,19 @@
#define BOOST_TEST_MAIN
#include <boost/test/unit_test.hpp>
#if (__cplusplus >= 201103L) || defined(BOOST_NO_CXX98_RANDOM_SHUFFLE)
#include <random>
std::default_random_engine gen;
template<typename RandomIt>
void do_shuffle(RandomIt first, RandomIt last)
{ std::shuffle(first, last, gen); }
#else
template<typename RandomIt>
void do_shuffle(RandomIt first, RandomIt last)
{ std::random_shuffle(first, last); }
#endif
class custom {
int m_x;
friend bool operator<(custom const& x, custom const& y);
@@ -117,7 +130,7 @@ void test_minmax(CIterator first, CIterator last, int n)
CHECK_EQUAL_ITERATORS( min, std::min_element(first, last), first );
CHECK_EQUAL_ITERATORS( max, std::max_element(first, last), first );
// second version, comp function object (keeps a counter!)
lc.reset();
tie( boost::minmax_element(first, last, lc), min, max );
@@ -183,7 +196,7 @@ void test_minmax(CIterator first, CIterator last, int n)
template <class Container, class Iterator, class Value>
void test_container(Iterator first, Iterator last, int n,
Container* dummy = 0
Container* /* dummy */ = 0
BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Value) )
{
Container c(first, last);
@@ -223,7 +236,7 @@ void test(int n BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Value))
test_range(first, last, n);
// Populate test vector with random values
std::random_shuffle(first, last);
do_shuffle(first, last);
test_range(first, last, n);
}