Commit 66f31224 by Jonathan Wakely Committed by Jonathan Wakely

Fix test failure with old Copy-On-Write std::string

	* testsuite/27_io/filesystem/filesystem_error/copy.cc: Fix static
	assertion failures with old std::string ABI.

From-SVN: r267577
parent 73d968d9
2019-01-04 Jonathan Wakely <jwakely@redhat.com> 2019-01-04 Jonathan Wakely <jwakely@redhat.com>
* testsuite/27_io/filesystem/filesystem_error/copy.cc: Fix static
assertion failures with old std::string ABI.
* include/bits/fs_path.h (path::_List::erase): Replace both overloads * include/bits/fs_path.h (path::_List::erase): Replace both overloads
with ... with ...
(path::pop_back(), path::_M_erase_from(const_iterator)): New member (path::pop_back(), path::_M_erase_from(const_iterator)): New member
......
...@@ -24,9 +24,19 @@ ...@@ -24,9 +24,19 @@
using std::filesystem::filesystem_error; using std::filesystem::filesystem_error;
// The COW std::string does not have noexcept copies, because copying a
// "leaked" string can throw (and for fully-dynamic strings, copying the
// empty rep can also throw).
// That's OK, because we know that the std::string in the std::runtime_error
// or std::logic_error base class won't be leaked (and usually won't be empty).
// The is_nothrow_xxx type traits don't know that though, so we can only
// check them for the cxx11 ABI, which uses __cow_string, which has noexcept
// copies.
#if _GLIBCXX_USE_CXX11_ABI
// PR libstdc++/83306 // PR libstdc++/83306
static_assert(std::is_nothrow_copy_constructible_v<filesystem_error>); static_assert(std::is_nothrow_copy_constructible_v<filesystem_error>);
static_assert(std::is_nothrow_copy_assignable_v<filesystem_error>); static_assert(std::is_nothrow_copy_assignable_v<filesystem_error>);
#endif
void void
test01() test01()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment