From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 3F5883857BB0; Thu, 11 Jan 2024 20:16:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3F5883857BB0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1705004207; bh=RKtSNBUyCwGhv+FnXUMHeRIyLkIhv/I67vyGVeO2IPM=; h=From:To:Subject:Date:From; b=O81eUU2SydYqAPuxjyNl3Trl+NezL43RQM9JUezzIutuk11Hff0OY4/GlLWVi8NeJ EbjgXqVOH7vzB1TNQKH8sgF6D26jFohZ1TEzaAJtuLkhm20DrGmsBhwdVzkFSpMySC /qpeMgYGJpoHnuPXXaVMhwrYWI1oeUlhLx+lPnDs= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-7154] libstdc++: use updated type for __unexpected_handler X-Act-Checkin: gcc X-Git-Author: Marcus Haehnel X-Git-Refname: refs/heads/master X-Git-Oldrev: adbc46942aee754238c1e8457b18ffb506018dc1 X-Git-Newrev: a7dea405d50d7069d5bf23b9c320e3fbebf6c6b4 Message-Id: <20240111201647.3F5883857BB0@sourceware.org> Date: Thu, 11 Jan 2024 20:16:47 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a7dea405d50d7069d5bf23b9c320e3fbebf6c6b4 commit r14-7154-ga7dea405d50d7069d5bf23b9c320e3fbebf6c6b4 Author: Marcus Haehnel Date: Thu Jan 11 16:05:54 2024 +0000 libstdc++: use updated type for __unexpected_handler Commit f4130a3eb545ab1aaf3ecb44f3d06b43e3751e04 changed the type of __expected_handler in libsupc++/unwind-cxx.h to be a std::terminate_handler to avoid a deprecated warning. However, the definition in eh_unex_handler.cc still used the old type (std::unexpected_handler) and thus causes a warning when compiling libstdc++ with -Wdeprecated-declarations (which is the default, for example, for clang). Adapt the definition to match the declaration. libstdc++-v3/ChangeLog: * libsupc++/eh_unex_handler.cc: Adjust definition type to declaration. Reviewed-by: Jonathan Wakely Diff: --- libstdc++-v3/libsupc++/eh_unex_handler.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/libsupc++/eh_unex_handler.cc b/libstdc++-v3/libsupc++/eh_unex_handler.cc index 7f1d4747b6d..c9b99568bfc 100644 --- a/libstdc++-v3/libsupc++/eh_unex_handler.cc +++ b/libstdc++-v3/libsupc++/eh_unex_handler.cc @@ -25,5 +25,5 @@ #include "unwind-cxx.h" /* The current installed user handler. */ -std::unexpected_handler __cxxabiv1::__unexpected_handler = std::terminate; +std::terminate_handler __cxxabiv1::__unexpected_handler = std::terminate;