PR libstdc++/81469 deprecate std::uncaught_exception for C++17

redi · redi · commit 194e23e922e5 · 2017-09-20T16:34:49.000Z
PR libstdc++/81469
	* libsupc++/exception (uncaught_exception): Deprecate for C++17.
	* testsuite/18_support/exception_ptr/62258.cc: Add -Wno-deprecated.
	* testsuite/18_support/uncaught_exception/14026.cc: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@253018 138bc75d-0d04-0410-961f-82ee72b054a4
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2017-09-20  Jonathan Wakely  <jwakely@redhat.com>
 
+	PR libstdc++/81469
+	* libsupc++/exception (uncaught_exception): Deprecate for C++17.
+	* testsuite/18_support/exception_ptr/62258.cc: Add -Wno-deprecated.
+	* testsuite/18_support/uncaught_exception/14026.cc: Likewise.
+
 	* include/bits/c++config (_GLIBCXX17_DEPRECATED): Define.
 	* include/bits/functional_hash.h (__hash_base::result_type)
 	(__hash_base::argument_type): Add _GLIBCXX17_DEPRECATED.
diff --git a/libstdc++-v3/libsupc++/exception b/libstdc++-v3/libsupc++/exception
@@ -98,9 +98,10 @@ namespace std
    *  %exception can result in a call of @c terminate()
    *  (15.5.1).'
    */
+  _GLIBCXX17_DEPRECATED
   bool uncaught_exception() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__pure__));
 
-#if __cplusplus > 201402L || !defined(__STRICT_ANSI__) // c++1z or gnu++98
+#if __cplusplus > 201402L || !defined(__STRICT_ANSI__) // c++17 or gnu++98
 #define __cpp_lib_uncaught_exceptions 201411
   /// The number of uncaught exceptions.
   int uncaught_exceptions() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__pure__));
diff --git a/libstdc++-v3/testsuite/18_support/exception_ptr/62258.cc b/libstdc++-v3/testsuite/18_support/exception_ptr/62258.cc
@@ -1,3 +1,4 @@
+// { dg-options "-Wno-deprecated" }
 // { dg-do run { target c++11 } }
 
 // Copyright (C) 2015-2017 Free Software Foundation, Inc.
diff --git a/libstdc++-v3/testsuite/18_support/uncaught_exception/14026.cc b/libstdc++-v3/testsuite/18_support/uncaught_exception/14026.cc
@@ -18,6 +18,8 @@
 // PR 14026
 // 18.6.4 uncaught_exception
 
+// { dg-options "-Wno-deprecated" }
+
 #include <cstdlib>
 #include <exception>
 #include <testsuite_hooks.h>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// { dg-options "-Wno-deprecated" }`
`1`	`2`	`// { dg-do run { target c++11 } }`
`2`	`3`
`3`	`4`	`// Copyright (C) 2015-2017 Free Software Foundation, Inc.`