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-10052] libstdc++: Fix mismatched noexcept-specifiers in Filesystem TS
Date: Mon,  9 May 2022 16:39:39 +0000 (GMT)	[thread overview]
Message-ID: <20220509163939.7674C3857805@sourceware.org> (raw)

https://gcc.gnu.org/g:7240bd42bf971c50a385f525d32b8911a8ff857d

commit r9-10052-g7240bd42bf971c50a385f525d32b8911a8ff857d
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Sep 27 22:07:12 2021 +0100

    libstdc++: Fix mismatched noexcept-specifiers in Filesystem TS
    
    The copy_file fix should have been part of r12-7063-gda72e0fd20f87b.
    
    The path::begin() fix should have been part of r12-3930-gf2b7f56a15d9cb.
    Thanks to Timm Bäder for reporting this one.
    
    libstdc++-v3/ChangeLog:
    
            * include/experimental/bits/fs_fwd.h (copy_file): Remove
            incorrect noexcept from declaration.
            * include/experimental/bits/fs_path.h (path::begin, path::end):
            Add noexcept to declarations, to match definitions.
    
    (cherry picked from commit 944da70a5d1cdc5bd4327b2d32420f57b6883985)

Diff:
---
 libstdc++-v3/include/experimental/bits/fs_fwd.h  | 2 +-
 libstdc++-v3/include/experimental/bits/fs_path.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libstdc++-v3/include/experimental/bits/fs_fwd.h b/libstdc++-v3/include/experimental/bits/fs_fwd.h
index 0da15ef4297..63cb6d15bec 100644
--- a/libstdc++-v3/include/experimental/bits/fs_fwd.h
+++ b/libstdc++-v3/include/experimental/bits/fs_fwd.h
@@ -263,7 +263,7 @@ _GLIBCXX_END_NAMESPACE_CXX11
 
   bool copy_file(const path& __from, const path& __to, copy_options __option);
   bool copy_file(const path& __from, const path& __to, copy_options __option,
-		 error_code&) noexcept;
+		 error_code&);
 
   path current_path();
 
diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h
index ba12b2f1734..8bc6abf155f 100644
--- a/libstdc++-v3/include/experimental/bits/fs_path.h
+++ b/libstdc++-v3/include/experimental/bits/fs_path.h
@@ -398,8 +398,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
     class iterator;
     typedef iterator const_iterator;
 
-    iterator begin() const;
-    iterator end() const;
+    iterator begin() const noexcept;
+    iterator end() const noexcept;
 
     // Create a basic_string by reading until a null character.
     template<typename _InputIterator,


                 reply	other threads:[~2022-05-09 16:39 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=20220509163939.7674C3857805@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).