Tested powerpc64le-linux, pushed to trunk.

We should use the SUGGEST macro for std::uncaught_exception()
deprecation warnings.

libstdc++-v3/ChangeLog:

        * include/bits/allocator.h: Qualify std::allocator_traits in
        deprecated warnings.
        * libsupc++/exception (uncaught_exception): Add suggestion to
        deprecated warning.
---
 libstdc++-v3/include/bits/allocator.h | 4 ++--
 libstdc++-v3/libsupc++/exception      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libstdc++-v3/include/bits/allocator.h 
b/libstdc++-v3/include/bits/allocator.h
index e0c322b5941..f7770165273 100644
--- a/libstdc++-v3/include/bits/allocator.h
+++ b/libstdc++-v3/include/bits/allocator.h
@@ -92,7 +92,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       using propagate_on_container_move_assignment = true_type;
 
       using is_always_equal
-       _GLIBCXX20_DEPRECATED_SUGGEST("allocator_traits::is_always_equal")
+       _GLIBCXX20_DEPRECATED_SUGGEST("std::allocator_traits::is_always_equal")
        = true_type;
 
 #if __cplusplus >= 202002L
@@ -146,7 +146,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       using propagate_on_container_move_assignment = true_type;
 
       using is_always_equal
-       _GLIBCXX20_DEPRECATED_SUGGEST("allocator_traits::is_always_equal")
+       _GLIBCXX20_DEPRECATED_SUGGEST("std::allocator_traits::is_always_equal")
        = true_type;
 #endif
 
diff --git a/libstdc++-v3/libsupc++/exception b/libstdc++-v3/libsupc++/exception
index a7d6b4b93ee..43f1cf71262 100644
--- a/libstdc++-v3/libsupc++/exception
+++ b/libstdc++-v3/libsupc++/exception
@@ -120,7 +120,7 @@ namespace std
    *  %exception can result in a call of 1terminate()`
    *  (15.5.1).'
    */
-  _GLIBCXX17_DEPRECATED
+  _GLIBCXX17_DEPRECATED_SUGGEST("std::uncaught_exceptions()")
   bool uncaught_exception() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__pure__));
 
 #if __cplusplus >= 201703L || !defined(__STRICT_ANSI__) // c++17 or gnu++98
-- 
2.34.1

Reply via email to