[committed] libstdc++: Add deprecated attribute to std::random_shuffle declarations
Checks
Commit Message
Tested x86_64-linux. Pushed to trunk.
Probably worth backporting to 12 and 13.
-- >8 --
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.
---
libstdc++-v3/include/bits/algorithmfwd.h | 2 ++
libstdc++-v3/include/bits/stl_algo.h | 6 +++---
.../25_algorithms/random_shuffle/1.cc | 1 +
.../25_algorithms/random_shuffle/59603.cc | 1 +
.../random_shuffle/deprecated.cc | 19 +++++++++++++++++++
.../25_algorithms/random_shuffle/moveable.cc | 1 +
6 files changed, 27 insertions(+), 3 deletions(-)
create mode 100644 libstdc++-v3/testsuite/25_algorithms/random_shuffle/deprecated.cc
@@ -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
@@ -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
@@ -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 }
@@ -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 "" }
new file mode 100644
@@ -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,4 +1,5 @@
// { dg-do run { target c++11 } }
+// { dg-options "-Wno-deprecated-declarations" }
// { dg-add-options using-deprecated }
// { dg-require-effective-target hosted }