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 r9-9336] libstdc++: Fix bootstrap error due to inconsistent noexcept-specifier [PR 99983]
Date: Fri,  9 Apr 2021 16:42:19 +0000 (GMT)	[thread overview]
Message-ID: <20210409164219.1E4A13AA7C93@sourceware.org> (raw)

https://gcc.gnu.org/g:9aeab5815df1ec52b1048a157ef243a4c45234b7

commit r9-9336-g9aeab5815df1ec52b1048a157ef243a4c45234b7
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Apr 9 15:47:26 2021 +0100

    libstdc++: Fix bootstrap error due to inconsistent noexcept-specifier [PR 99983]
    
    The backport of r11-8062 as r9-9328 missed out a piece, which causes
    bootstrap failures.
    
            PR bootstrap/99983
            * include/bits/hashtable.h (_Hashtable): Fix noexcept-specifier
            on definition to match the one on the declaration.

Diff:
---
 libstdc++-v3/include/bits/hashtable.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h
index 6bb83bec4e3..910cbaecae2 100644
--- a/libstdc++-v3/include/bits/hashtable.h
+++ b/libstdc++-v3/include/bits/hashtable.h
@@ -1283,8 +1283,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	       _H1, _H2, _Hash, _RehashPolicy, _Traits>::
     _Hashtable(_Hashtable&& __ht, __node_alloc_type&& __a,
 	       true_type /* alloc always equal */)
-    noexcept(std::is_nothrow_copy_constructible<_H1>::value &&
-	     std::is_nothrow_copy_constructible<_Equal>::value)
+    noexcept(_S_nothrow_move())
     : __hashtable_base(__ht),
       __map_base(__ht),
       __rehash_base(__ht),


                 reply	other threads:[~2021-04-09 16:42 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=20210409164219.1E4A13AA7C93@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).