diff options
Diffstat (limited to 'libcxx/test/std/strings/basic.string')
4 files changed, 56 insertions, 3 deletions
diff --git a/libcxx/test/std/strings/basic.string/string.cons/alloc.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/alloc.pass.cpp index 512d1182755..1c4f2044834 100644 --- a/libcxx/test/std/strings/basic.string/string.cons/alloc.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.cons/alloc.pass.cpp @@ -14,6 +14,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "test_allocator.h" #include "min_allocator.h" @@ -22,6 +23,11 @@ void test() { { +#if TEST_STD_VER > 14 + static_assert((noexcept(S{})), "" ); +#elif TEST_STD_VER >= 11 + static_assert((noexcept(S()) == noexcept(typename S::allocator_type())), "" ); +#endif S s; assert(s.__invariants()); assert(s.data()); @@ -30,6 +36,11 @@ test() assert(s.get_allocator() == typename S::allocator_type()); } { +#if TEST_STD_VER > 14 + static_assert((noexcept(S{typename S::allocator_type{}})), "" ); +#elif TEST_STD_VER >= 11 + static_assert((noexcept(S(typename S::allocator_type())) == std::is_nothrow_copy_constructible<typename S::allocator_type>::value), "" ); +#endif S s(typename S::allocator_type(5)); assert(s.__invariants()); assert(s.data()); @@ -39,13 +50,18 @@ test() } } -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 template <class S> void test2() { { +#if TEST_STD_VER > 14 + static_assert((noexcept(S{})), "" ); +#elif TEST_STD_VER >= 11 + static_assert((noexcept(S()) == noexcept(typename S::allocator_type())), "" ); +#endif S s; assert(s.__invariants()); assert(s.data()); @@ -54,6 +70,11 @@ test2() assert(s.get_allocator() == typename S::allocator_type()); } { +#if TEST_STD_VER > 14 + static_assert((noexcept(S{typename S::allocator_type{}})), "" ); +#elif TEST_STD_VER >= 11 + static_assert((noexcept(S(typename S::allocator_type())) == std::is_nothrow_copy_constructible<typename S::allocator_type>::value), "" ); +#endif S s(typename S::allocator_type{}); assert(s.__invariants()); assert(s.data()); @@ -68,7 +89,7 @@ test2() int main() { test<std::basic_string<char, std::char_traits<char>, test_allocator<char> > >(); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 test2<std::basic_string<char, std::char_traits<char>, min_allocator<char> > >(); #endif } diff --git a/libcxx/test/std/strings/basic.string/string.cons/default_noexcept.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/default_noexcept.pass.cpp index f935db83d73..c6137d6b54b 100644 --- a/libcxx/test/std/strings/basic.string/string.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.cons/default_noexcept.pass.cpp @@ -17,6 +17,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "test_allocator.h" template <class T> @@ -39,7 +40,12 @@ int main() } { typedef std::basic_string<char, std::char_traits<char>, some_alloc<char>> C; +// See N4258 - basic_string<char, traits, Allocator>::basic_string() noexcept; +#if TEST_STD_VER <= 14 static_assert(!std::is_nothrow_default_constructible<C>::value, ""); +#else + static_assert( std::is_nothrow_default_constructible<C>::value, ""); +#endif } #endif } diff --git a/libcxx/test/std/strings/basic.string/string.cons/move_alloc.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/move_alloc.pass.cpp index 1f9631449ee..a232a46bd9f 100644 --- a/libcxx/test/std/strings/basic.string/string.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.cons/move_alloc.pass.cpp @@ -16,6 +16,7 @@ #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES +#include "test_macros.h" #include "test_allocator.h" #include "min_allocator.h" @@ -34,6 +35,11 @@ test(S s0, const typename S::allocator_type& a) } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES +// #if _LIBCPP_STD_VER <= 14 +// _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value); +// #else +// _NOEXCEPT; +// #endif int main() { @@ -41,6 +47,11 @@ int main() { typedef test_allocator<char> A; typedef std::basic_string<char, std::char_traits<char>, A> S; +#if TEST_STD_VER > 14 + static_assert((noexcept(S{})), "" ); +#elif TEST_STD_VER >= 11 + static_assert((noexcept(S()) == std::is_nothrow_move_constructible<A>::value), "" ); +#endif test(S(), A(3)); test(S("1"), A(5)); test(S("1234567890123456789012345678901234567890123456789012345678901234567890"), A(7)); @@ -50,15 +61,25 @@ int main() { typedef test_allocator<char> A; typedef std::basic_string<char, std::char_traits<char>, A> S; +#if TEST_STD_VER > 14 + static_assert((noexcept(S{})), "" ); +#elif TEST_STD_VER >= 11 + static_assert((noexcept(S()) == std::is_nothrow_move_constructible<A>::value), "" ); +#endif S s1 ( "Twas brillig, and the slivy toves did gyre and gymbal in the wabe" ); S s2 (std::move(s1), A(1)); } assert ( test_alloc_base::alloc_count == alloc_count ); -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11 { typedef min_allocator<char> A; typedef std::basic_string<char, std::char_traits<char>, A> S; +#if TEST_STD_VER > 14 + static_assert((noexcept(S{})), "" ); +#elif TEST_STD_VER >= 11 + static_assert((noexcept(S()) == std::is_nothrow_move_constructible<A>::value), "" ); +#endif test(S(), A()); test(S("1"), A()); test(S("1234567890123456789012345678901234567890123456789012345678901234567890"), A()); diff --git a/libcxx/test/std/strings/basic.string/string.cons/move_noexcept.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/move_noexcept.pass.cpp index 556aabdc44a..b287a940cc8 100644 --- a/libcxx/test/std/strings/basic.string/string.cons/move_noexcept.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.cons/move_noexcept.pass.cpp @@ -17,6 +17,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "test_allocator.h" template <class T> @@ -39,7 +40,11 @@ int main() } { typedef std::basic_string<char, std::char_traits<char>, some_alloc<char>> C; +#if TEST_STD_VER <= 14 static_assert(!std::is_nothrow_move_constructible<C>::value, ""); +#else + static_assert( std::is_nothrow_move_constructible<C>::value, ""); +#endif } #endif } |
