diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2017-03-23 13:43:37 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2017-03-23 13:43:37 +0000 |
| commit | 0f37a410293c8b507f51556eed5954d1a2fb0499 (patch) | |
| tree | 7006292095aa2f953cf5504f60406745610e524d /libcxx/include/algorithm | |
| parent | f9fa62e576d63bf7b1b9ecc9665f4c9ab654ce58 (diff) | |
| download | bcm5719-llvm-0f37a410293c8b507f51556eed5954d1a2fb0499.tar.gz bcm5719-llvm-0f37a410293c8b507f51556eed5954d1a2fb0499.zip | |
Remove random_shuffle in C++17. Please use shuffle instead. If you have to, you cant get it back by defining _LIBCPP_ENABLE_CXX17_REMOVED_RANDOM_SHUFFLE before including any libc++ headers.
llvm-svn: 298597
Diffstat (limited to 'libcxx/include/algorithm')
| -rw-r--r-- | libcxx/include/algorithm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 5eec80ca013..bba6d8d3d66 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -281,12 +281,12 @@ template <class ForwardIterator, class OutputIterator> template <class RandomAccessIterator> void - random_shuffle(RandomAccessIterator first, RandomAccessIterator last); // deprecated in C++14 + random_shuffle(RandomAccessIterator first, RandomAccessIterator last); // deprecated in C++14, removed in C++17 template <class RandomAccessIterator, class RandomNumberGenerator> void random_shuffle(RandomAccessIterator first, RandomAccessIterator last, - RandomNumberGenerator& rand); // deprecated in C++14 + RandomNumberGenerator& rand); // deprecated in C++14, removed in C++17 template<class PopulationIterator, class SampleIterator, class Distance, class UniformRandomBitGenerator> @@ -3026,6 +3026,7 @@ uniform_int_distribution<_IntType>::operator()(_URNG& __g, const param_type& __p return static_cast<result_type>(__u + __p.a()); } +#if _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_RANDOM_SHUFFLE) class _LIBCPP_TYPE_VIS __rs_default; _LIBCPP_FUNC_VIS __rs_default __rs_get(); @@ -3095,6 +3096,7 @@ random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last, } } } +#endif template <class _PopulationIterator, class _SampleIterator, class _Distance, class _UniformRandomNumberGenerator> |
