boostorg/algorithm
1
0
Fork 1
mirror of https://github.com/boostorg/algorithm.git synced 2025-07-31 21:14:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36 from DanielaE/feature/replace-deprecated

Browse Source 
Conditionally replace deprecated c++98 features by c++11 ones
This commit is contained in:
Marshall Clow
2017-08-29 07:41:02 -07:00
committed by GitHub
parent f14719c3a9 8ae18ae455
commit f9583cfd39
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
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);
@@ -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);
}

2
test/partition_subrange_test.cpp
View File

@@ -8,7 +8,7 @@
#include <vector>
#include <iostream>
#if __cplusplus >= 201103L
#if (__cplusplus >= 201103L) || defined(BOOST_NO_CXX98_RANDOM_SHUFFLE)
#include <random>
std::default_random_engine gen;

2
test/sort_subrange_test.cpp
View File

@@ -8,7 +8,7 @@
#include <vector>
#include <iostream>
#if __cplusplus >= 201103L
#if (__cplusplus >= 201103L) || defined(BOOST_NO_CXX98_RANDOM_SHUFFLE)
#include <random>
std::default_random_engine gen;