From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id C8E613857362; Mon, 9 May 2022 16:40:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C8E613857362 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r9-10064] libstdc++: Remove un-implementable noexcept from Filesystem TS operations X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: 93a621991615e943704ed1a957d934736bf8a3d3 X-Git-Newrev: a1667b7a7bdf6070eb6294d0f3126b801201852c Message-Id: <20220509164041.C8E613857362@sourceware.org> Date: Mon, 9 May 2022 16:40:41 +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: Mon, 09 May 2022 16:40:41 -0000 https://gcc.gnu.org/g:a1667b7a7bdf6070eb6294d0f3126b801201852c commit r9-10064-ga1667b7a7bdf6070eb6294d0f3126b801201852c Author: Jonathan Wakely Date: Fri Feb 4 15:23:31 2022 +0000 libstdc++: Remove un-implementable noexcept from Filesystem TS operations LWG 3014 removed these incorrect noexcept specifications from the C++17 std::filesystem operations. They are also incorrect on the experimental TS versions and should be removed from them too. libstdc++-v3/ChangeLog: * include/experimental/bits/fs_ops.h (fs::copy_file): Remove noexcept. (fs::create_directories): Likewise. (fs::remove_all): Likewise. * src/filesystem/ops.cc (fs::copy_file): Remove noexcept. (fs::create_directories): Likewise. (fs::remove_all): Likewise. (cherry picked from commit da72e0fd20f87bb523a81a505c00546d3622e9dd) Diff: --- libstdc++-v3/include/experimental/bits/fs_ops.h | 8 ++++---- libstdc++-v3/src/filesystem/ops.cc | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/include/experimental/bits/fs_ops.h b/libstdc++-v3/include/experimental/bits/fs_ops.h index c92cb56bd75..e41f023da18 100644 --- a/libstdc++-v3/include/experimental/bits/fs_ops.h +++ b/libstdc++-v3/include/experimental/bits/fs_ops.h @@ -74,19 +74,19 @@ inline namespace v1 { return copy_file(__from, __to, copy_options::none); } inline bool - copy_file(const path& __from, const path& __to, error_code& __ec) noexcept + copy_file(const path& __from, const path& __to, error_code& __ec) { return copy_file(__from, __to, copy_options::none, __ec); } 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& __ec) noexcept; + error_code& __ec); void copy_symlink(const path& __existing_symlink, const path& __new_symlink); void copy_symlink(const path& __existing_symlink, const path& __new_symlink, error_code& __ec) noexcept; bool create_directories(const path& __p); - bool create_directories(const path& __p, error_code& __ec) noexcept; + bool create_directories(const path& __p, error_code& __ec); bool create_directory(const path& __p); bool create_directory(const path& __p, error_code& __ec) noexcept; @@ -262,7 +262,7 @@ inline namespace v1 bool remove(const path& __p, error_code& __ec) noexcept; uintmax_t remove_all(const path& __p); - uintmax_t remove_all(const path& __p, error_code& __ec) noexcept; + uintmax_t remove_all(const path& __p, error_code& __ec); void rename(const path& __from, const path& __to); void rename(const path& __from, const path& __to, error_code& __ec) noexcept; diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc index ea2693622de..d920afeffb0 100644 --- a/libstdc++-v3/src/filesystem/ops.cc +++ b/libstdc++-v3/src/filesystem/ops.cc @@ -366,7 +366,7 @@ fs::copy_file(const path& from, const path& to, copy_options option) bool fs::copy_file(const path& from, const path& to, copy_options options, - error_code& ec) noexcept + error_code& ec) { #ifdef _GLIBCXX_HAVE_SYS_STAT_H return do_copy_file(from.c_str(), to.c_str(), copy_file_options(options), @@ -418,7 +418,7 @@ fs::create_directories(const path& p) } bool -fs::create_directories(const path& p, error_code& ec) noexcept +fs::create_directories(const path& p, error_code& ec) { if (p.empty()) { @@ -1092,7 +1092,7 @@ fs::remove_all(const path& p) } std::uintmax_t -fs::remove_all(const path& p, error_code& ec) noexcept +fs::remove_all(const path& p, error_code& ec) { const auto s = symlink_status(p, ec); if (!status_known(s))