]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Fix mismatched noexcept-specifiers in Filesystem TS
authorJonathan Wakely <jwakely@redhat.com>
Mon, 27 Sep 2021 21:07:12 +0000 (22:07 +0100)
committerJonathan Wakely <jwakely@redhat.com>
Mon, 4 Apr 2022 11:45:31 +0000 (12:45 +0100)
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)

libstdc++-v3/include/experimental/bits/fs_fwd.h
libstdc++-v3/include/experimental/bits/fs_path.h

index 8d63e095be51f0edb6d586f436d3e293aca3b4af..7decf95ee6dc5b7193d573e6b2927e8dc743294d 100644 (file)
@@ -280,7 +280,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();
 
index a2bc931c69601ac119aed76379cc39dd37d95c7b..1cc1b3bf686bea569769deaafa83d8ea4b812fb4 100644 (file)
@@ -425,8 +425,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.