From: Marcus Haehnel Date: Thu, 11 Jan 2024 16:05:54 +0000 (+0000) Subject: libstdc++: use updated type for __unexpected_handler X-Git-Tag: basepoints/gcc-15~2985 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7dea405d50d7069d5bf23b9c320e3fbebf6c6b4;p=thirdparty%2Fgcc.git 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 --git a/libstdc++-v3/libsupc++/eh_unex_handler.cc b/libstdc++-v3/libsupc++/eh_unex_handler.cc index 7f1d4747b6d3..c9b99568bfc7 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;