From e3fbe1433b02d52a833b06219184ee4f4852b50a Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Mon, 13 Jul 2015 20:04:56 +0000 Subject: Implement the first part of N4258: 'Cleaning up noexcept in the Library'. This patch deals with swapping containers, and implements a more strict noexcept specification (a conforming extension) than the standard mandates. llvm-svn: 242056 --- .../string.special/swap_noexcept.pass.cpp | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'libcxx/test/std/strings/basic.string/string.nonmembers') diff --git a/libcxx/test/std/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp b/libcxx/test/std/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp index 4d5d79693d0..cfe03655a8a 100644 --- a/libcxx/test/std/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp @@ -12,6 +12,10 @@ // void swap(basic_string& c) // noexcept(!allocator_type::propagate_on_container_swap::value || // __is_nothrow_swappable::value); +// +// In C++17, the standard says that swap shall have: +// noexcept(allocator_traits::propagate_on_container_swap::value || +// allocator_traits::is_always_equal::value); // This tests a conforming extension @@ -32,6 +36,19 @@ struct some_alloc typedef std::true_type propagate_on_container_swap; }; +template +struct some_alloc2 +{ + typedef T value_type; + + some_alloc2() {} + some_alloc2(const some_alloc2&); + void deallocate(void*, unsigned) {} + + typedef std::false_type propagate_on_container_swap; + typedef std::true_type is_always_equal; +}; + int main() { #if __has_feature(cxx_noexcept) @@ -48,7 +65,21 @@ int main() { typedef std::basic_string, some_alloc> C; C c1, c2; +#if TEST_STD_VER >= 14 + // In c++14, if POCS is set, swapping the allocator is required not to throw + static_assert( noexcept(swap(c1, c2)), ""); +#else static_assert(!noexcept(swap(c1, c2)), ""); +#endif } +#if TEST_STD_VER >= 14 + { + typedef std::basic_string, some_alloc2> C; + C c1, c2; + // if the allocators are always equal, then the swap can be noexcept + static_assert( noexcept(swap(c1, c2)), ""); + } +#endif + #endif } -- cgit v1.2.3