From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 3 Feb 2022 13:17:05 +0000 (+0000)
Subject: libstdc++: Add suggestion to std::uncaught_exception() warning
X-Git-Tag: releases/gcc-11.3.0~132
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab0efe756e22d3124a3614d2907f5df6d269b675;p=thirdparty%2Fgcc.git

libstdc++: Add suggestion to std::uncaught_exception() warning

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.

(cherry picked from commit 27ba40559ccb887458009a34f710d4a22af85156)
---

diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h
index a6883c6758a4..e0c0a4b56bf1 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 a023e22ea89f..61ed33733605 100644
--- a/libstdc++-v3/libsupc++/exception
+++ b/libstdc++-v3/libsupc++/exception
@@ -105,7 +105,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