FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Add deprecated attribute to std::random_shuffle declarations

Browse source 
We already have these attributes on the definitions in <bits/stl_algo.h>
but they don't work due to PR c++/84542. Add the attributes to the
declarations in <bits/algorithmfwd.h> as well, and add a test.

libstdc++-v3/ChangeLog:

	* include/bits/algorithmfwd.h (random_shuffle): Add deprecated
	attribute.
	* include/bits/stl_algo.h (random_shuffle): Correct comments.
	* testsuite/25_algorithms/random_shuffle/1.cc: Disable
	deprecated warnings.
	* testsuite/25_algorithms/random_shuffle/59603.cc: Likewise.
	* testsuite/25_algorithms/random_shuffle/moveable.cc: Likewise.
	* testsuite/25_algorithms/random_shuffle/deprecated.cc: New
	test.
This commit is contained in:
Jonathan Wakely 2023-07-26 14:05:58 +01:00
parent d74aed3d7a
commit c01b344e81
6 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libstdc++-v3/include/bits/algorithmfwd.h
View file

@ -832,10 +832,12 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
#if _GLIBCXX_HOSTED
template<typename _RAIter>
_GLIBCXX14_DEPRECATED_SUGGEST("std::shuffle")
void
random_shuffle(_RAIter, _RAIter);
template<typename _RAIter, typename _Generator>
_GLIBCXX14_DEPRECATED_SUGGEST("std::shuffle")
void
random_shuffle(_RAIter, _RAIter,
#if __cplusplus >= 201103L

6
libstdc++-v3/include/bits/stl_algo.h
View file

@ -4479,7 +4479,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* equally likely.
*
* @deprecated
* Since C++14 `std::random_shuffle` is not part of the C++ standard.
* Since C++17, `std::random_shuffle` is not part of the C++ standard.
* Use `std::shuffle` instead, which was introduced in C++11.
*/
template<typename _RandomAccessIterator>
@ -4518,7 +4518,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* range `[0, N)`.
*
* @deprecated
* Since C++14 `std::random_shuffle` is not part of the C++ standard.
* Since C++17, `std::random_shuffle` is not part of the C++ standard.
* Use `std::shuffle` instead, which was introduced in C++11.
*/
template<typename _RandomAccessIterator, typename _RandomNumberGenerator>
@ -4546,7 +4546,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
}
}
#endif // HOSTED
#endif // C++11 || USE_DEPRECATED
#endif // <= C++11 || USE_DEPRECATED
/**
* @brief Move elements for which a predicate is true to the beginning

1
libstdc++-v3/testsuite/25_algorithms/random_shuffle/1.cc
View file

@ -15,6 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-Wno-deprecated-declarations" }
// { dg-add-options using-deprecated }
// { dg-require-effective-target hosted }

1
libstdc++-v3/testsuite/25_algorithms/random_shuffle/59603.cc
View file

@ -16,6 +16,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do run { target c++11 } }
// { dg-options "-Wno-deprecated-declarations" }
// { dg-add-options using-deprecated }
// { dg-require-debug-mode "" }

19
libstdc++-v3/testsuite/25_algorithms/random_shuffle/deprecated.cc Normal file
View file

@ -0,0 +1,19 @@
// { dg-do compile }
// { dg-add-options using-deprecated }
// { dg-require-effective-target hosted }
// std::random_shuffle was deprecated in C++17 and removed in C++17.
#include <algorithm>
std::ptrdiff_t rando(std::ptrdiff_t n);
void
test_depr(int* first, int* last)
{
std::random_shuffle(first, last);
// { dg-warning "deprecated" "" { target c++14 } 14 }
std::random_shuffle(first, last, rando);
// { dg-warning "deprecated" "" { target c++14 } 17 }
}

1
libstdc++-v3/testsuite/25_algorithms/random_shuffle/moveable.cc
View file

@ -1,4 +1,5 @@
// { dg-do run { target c++11 } }
// { dg-options "-Wno-deprecated-declarations" }
// { dg-add-options using-deprecated }
// { dg-require-effective-target hosted }