diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/fs_dir.h | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 93d847a..c9cd62a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2018-07-20 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/86595 + * include/bits/fs_dir.h (directory_entry::refresh(error_code&)): Add + noexcept. + 2018-07-20 Fangrui Song <maskray@google.com> * include/bits/shared_ptr_base.h (_Sp_make_shared_tag::_S_ti): Use diff --git a/libstdc++-v3/include/bits/fs_dir.h b/libstdc++-v3/include/bits/fs_dir.h index 6b332e1..cf7a3c2 100644 --- a/libstdc++-v3/include/bits/fs_dir.h +++ b/libstdc++-v3/include/bits/fs_dir.h @@ -138,8 +138,13 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 refresh(__ec); } - void refresh() { _M_type = symlink_status().type(); } - void refresh(error_code& __ec) { _M_type = symlink_status(__ec).type(); } + void + refresh() + { _M_type = symlink_status().type(); } + + void + refresh(error_code& __ec) noexcept + { _M_type = symlink_status(__ec).type(); } // observers const filesystem::path& path() const noexcept { return _M_path; } |