]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: use updated type for __unexpected_handler
authorMarcus Haehnel <marcus.haehnel@kernkonzept.com>
Thu, 11 Jan 2024 16:05:54 +0000 (16:05 +0000)
committerJonathan Wakely <jwakely@redhat.com>
Thu, 11 Jan 2024 19:11:45 +0000 (19:11 +0000)
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 <jwakely@redhat.com>
libstdc++-v3/libsupc++/eh_unex_handler.cc

index 7f1d4747b6d3746051924139fbda713fe3b3bf12..c9b99568bfc7a615f8a4b8b6074dc50f2d3f1cc3 100644 (file)
@@ -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;