aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Haehnel <marcus.haehnel@kernkonzept.com>2024-01-11 16:05:54 +0000
committerJonathan Wakely <jwakely@redhat.com>2024-01-11 19:11:45 +0000
commita7dea405d50d7069d5bf23b9c320e3fbebf6c6b4 (patch)
tree5349820877bb8ccfb19d052262056d5be91cd924
parentadbc46942aee754238c1e8457b18ffb506018dc1 (diff)
downloadgcc-a7dea405d50d7069d5bf23b9c320e3fbebf6c6b4.zip
gcc-a7dea405d50d7069d5bf23b9c320e3fbebf6c6b4.tar.gz
gcc-a7dea405d50d7069d5bf23b9c320e3fbebf6c6b4.tar.bz2
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 <jwakely@redhat.com>
-rw-r--r--libstdc++-v3/libsupc++/eh_unex_handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/libsupc++/eh_unex_handler.cc b/libstdc++-v3/libsupc++/eh_unex_handler.cc
index 7f1d474..c9b9956 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;