public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r14-7154] libstdc++: use updated type for __unexpected_handler
Date: Thu, 11 Jan 2024 20:16:47 +0000 (GMT)	[thread overview]
Message-ID: <20240111201647.3F5883857BB0@sourceware.org> (raw)

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;

                 reply	other threads:[~2024-01-11 20:16 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240111201647.3F5883857BB0@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).