From d64ff962bc0d297b351ad7156bfedc025a38726b Mon Sep 17 00:00:00 2001 From: redi Date: Thu, 16 Aug 2018 16:56:40 +0000 Subject: [PATCH] Avoid deprecation warning with -Wsystem-headers C++17 says to use std::uncaught_exceptions() here instead of std::uncaught_exception() but since we only care whether the result is non-zero (and we aren't planning to remove the deprecated version) we can just keep using std::uncaught_exception() and suppress the warning. * include/std/ostream (basic_ostream::sentry::~sentry): Suppress deprecation warnings for using uncaught_exception(). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@263593 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/std/ostream | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6c277ff728a..fdf992ef101 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2018-08-16 Jonathan Wakely + * include/std/ostream (basic_ostream::sentry::~sentry): Suppress + deprecation warnings for using uncaught_exception(). + PR libstdc++/86447 * src/c++11/cow-stdexcept.cc [_GLIBCXX_FULLY_DYNAMIC_STRING] (logic_error::logic_error(logic_error&&)) diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream index 448a9288188..2099294fd92 100644 --- a/libstdc++-v3/include/std/ostream +++ b/libstdc++-v3/include/std/ostream @@ -444,6 +444,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION explicit sentry(basic_ostream<_CharT, _Traits>& __os); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" /** * @brief Possibly flushes the stream. * @@ -461,6 +463,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_os.setstate(ios_base::badbit); } } +#pragma GCC diagnostic pop /** * @brief Quick status checking. -- 2.11.4.GIT