From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 740E63857C4A; Tue, 26 Apr 2022 13:12:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 740E63857C4A MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r10-10567] libstdc++: Fix mismatched noexcept-specifiers in Filesystem TS X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 19f48f2ae221877401e23eafed4753d71400c141 X-Git-Newrev: 44f0abd19ca504fcdcf6841255008a6318492714 Message-Id: <20220426131225.740E63857C4A@sourceware.org> Date: Tue, 26 Apr 2022 13:12:25 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2022 13:12:25 -0000 https://gcc.gnu.org/g:44f0abd19ca504fcdcf6841255008a6318492714 commit r10-10567-g44f0abd19ca504fcdcf6841255008a6318492714 Author: Jonathan Wakely 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 4c80401ac14..bc779e930d4 100644 --- a/libstdc++-v3/include/experimental/bits/fs_fwd.h +++ b/libstdc++-v3/include/experimental/bits/fs_fwd.h @@ -264,7 +264,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 0a8f4eee0a1..927cf2278d1 100644 --- a/libstdc++-v3/include/experimental/bits/fs_path.h +++ b/libstdc++-v3/include/experimental/bits/fs_path.h @@ -419,8 +419,8 @@ namespace __detail class iterator; typedef iterator const_iterator; - iterator begin() const; - iterator end() const; + iterator begin() const noexcept; + iterator end() const noexcept; /// @cond undocumented // Create a basic_string by reading until a null character.