[gcc r14-7154] libstdc++: use updated type for __unexpected_handler

Jonathan Wakely redi@gcc.gnu.org
Thu Jan 11 20:16:47 GMT 2024


https://gcc.gnu.org/g:a7dea405d50d7069d5bf23b9c320e3fbebf6c6b4

commit r14-7154-ga7dea405d50d7069d5bf23b9c320e3fbebf6c6b4
Author: Marcus Haehnel <marcus.haehnel@kernkonzept.com>
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 <jwakely@redhat.com>

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;


More information about the Libstdc++-cvs mailing list