diff options
Diffstat (limited to 'libcxx/test/std/utilities/any/any.class')
3 files changed, 4 insertions, 8 deletions
diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp index ebd49ccdcbd..fb7dda886fe 100644 --- a/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp @@ -80,8 +80,8 @@ void test_move() { assert(Type::moved == 1 || Type::moved == 2); // zero or more move operations can be performed. assert(Type::copied == 0); // no copies can be performed. assert(Type::count == 1 + a.has_value()); - assertEmpty(a); // Moves are always destructive. assertContains<Type>(a2, 42); + LIBCPP_ASSERT(!a.has_value()); // Moves are always destructive. if (a.has_value()) assertContains<Type>(a, 0); } diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp index 24160dcc1de..8795dfd4e36 100644 --- a/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp @@ -137,10 +137,6 @@ void test_sfinae_constraints() { static_assert(!std::is_constructible<std::any, T>::value, ""); } { - using DecayTag = std::decay_t<BadTag>; - static_assert(!std::is_constructible<std::any, DecayTag>::value, ""); - } - { // Test that the ValueType&& constructor SFINAE's away when the // argument is non-copyable struct NoCopy { diff --git a/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp index 1fef43fc585..6fc100943d0 100644 --- a/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp @@ -104,7 +104,7 @@ void test_self_swap() { assertContains<T>(a, 42); assert(T::count == 1); assert(T::copied == 0); - assert(T::moved == 0); + LIBCPP_ASSERT(T::moved == 0); } assert(small::count == 0); { // large @@ -113,9 +113,9 @@ void test_self_swap() { T::reset(); a.swap(a); assertContains<T>(a, 42); - assert(T::copied == 0); - assert(T::moved == 0); assert(T::count == 1); + assert(T::copied == 0); + LIBCPP_ASSERT(T::moved == 0); } assert(large::count == 0); } |
