diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-09-27 22:07:12 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-04-01 13:17:18 +0100 |
| commit | 944da70a5d1cdc5bd4327b2d32420f57b6883985 (patch) | |
| tree | 33916d9eb4e3fb0b3f04acd2836ad48c79083a58 /libstdc++-v3/include/experimental | |
| parent | bfa9f660d25aef1513b1289d01c80b52090ef72a (diff) | |
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.
Diffstat (limited to 'libstdc++-v3/include/experimental')
| -rw-r--r-- | libstdc++-v3/include/experimental/bits/fs_fwd.h | 2 | ||||
| -rw-r--r-- | 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 d568e9e3a73..c8fbcbc1679 100644 --- a/libstdc++-v3/include/experimental/bits/fs_fwd.h +++ b/libstdc++-v3/include/experimental/bits/fs_fwd.h @@ -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(); diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h index a050749676d..803df424664 100644 --- a/libstdc++-v3/include/experimental/bits/fs_path.h +++ b/libstdc++-v3/include/experimental/bits/fs_path.h @@ -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. |