Author: ericwf Date: Wed Jan 4 16:43:08 2017 New Revision: 291021 URL: http://llvm.org/viewvc/llvm-project?rev=291021&view=rev Log: Use C++11 static_assert in variant tests. Patch from Michael Park
Modified: libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.ctor/move.pass.cpp libcxx/trunk/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp Modified: libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp?rev=291021&r1=291020&r2=291021&view=diff ============================================================================== --- libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp (original) +++ libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp Wed Jan 4 16:43:08 2017 @@ -72,45 +72,45 @@ void test_copy_ctor_sfinae() { void test_copy_ctor_basic() { { constexpr std::variant<int> v(std::in_place_index<0>, 42); - static_assert(v.index() == 0); + static_assert(v.index() == 0, ""); constexpr std::variant<int> v2 = v; - static_assert(v2.index() == 0); - static_assert(std::get<0>(v2) == 42); + static_assert(v2.index() == 0, ""); + static_assert(std::get<0>(v2) == 42, ""); } { constexpr std::variant<int, long> v(std::in_place_index<1>, 42); - static_assert(v.index() == 1); + static_assert(v.index() == 1, ""); constexpr std::variant<int, long> v2 = v; - static_assert(v2.index() == 1); - static_assert(std::get<1>(v2) == 42); + static_assert(v2.index() == 1, ""); + static_assert(std::get<1>(v2) == 42, ""); } { constexpr std::variant<TCopy> v(std::in_place_index<0>, 42); - static_assert(v.index() == 0); + static_assert(v.index() == 0, ""); constexpr std::variant<TCopy> v2(v); - static_assert(v2.index() == 0); - static_assert(std::get<0>(v2).value == 42); + static_assert(v2.index() == 0, ""); + static_assert(std::get<0>(v2).value == 42, ""); } { constexpr std::variant<int, TCopy> v(std::in_place_index<1>, 42); - static_assert(v.index() == 1); + static_assert(v.index() == 1, ""); constexpr std::variant<int, TCopy> v2(v); - static_assert(v2.index() == 1); - static_assert(std::get<1>(v2).value == 42); + static_assert(v2.index() == 1, ""); + static_assert(std::get<1>(v2).value == 42, ""); } { constexpr std::variant<TCopyNTMove> v(std::in_place_index<0>, 42); - static_assert(v.index() == 0); + static_assert(v.index() == 0, ""); constexpr std::variant<TCopyNTMove> v2(v); - static_assert(v2.index() == 0); - static_assert(std::get<0>(v2).value == 42); + static_assert(v2.index() == 0, ""); + static_assert(std::get<0>(v2).value == 42, ""); } { constexpr std::variant<int, TCopyNTMove> v(std::in_place_index<1>, 42); - static_assert(v.index() == 1); + static_assert(v.index() == 1, ""); constexpr std::variant<int, TCopyNTMove> v2(v); - static_assert(v2.index() == 1); - static_assert(std::get<1>(v2).value == 42); + static_assert(v2.index() == 1, ""); + static_assert(std::get<1>(v2).value == 42, ""); } } Modified: libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.ctor/move.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.ctor/move.pass.cpp?rev=291021&r1=291020&r2=291021&view=diff ============================================================================== --- libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.ctor/move.pass.cpp (original) +++ libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.ctor/move.pass.cpp Wed Jan 4 16:43:08 2017 @@ -82,8 +82,8 @@ void test_move_ctor_basic() { } } test; constexpr auto result = test(); - static_assert(result.index == 0); - static_assert(result.value == 42); + static_assert(result.index == 0, ""); + static_assert(result.value == 42, ""); } { struct { @@ -94,8 +94,8 @@ void test_move_ctor_basic() { } } test; constexpr auto result = test(); - static_assert(result.index == 1); - static_assert(result.value == 42); + static_assert(result.index == 1, ""); + static_assert(result.value == 42, ""); } { struct { @@ -106,8 +106,8 @@ void test_move_ctor_basic() { } } test; constexpr auto result = test(); - static_assert(result.index == 0); - static_assert(result.value.value == 42); + static_assert(result.index == 0, ""); + static_assert(result.value.value == 42, ""); } { struct { @@ -118,8 +118,8 @@ void test_move_ctor_basic() { } } test; constexpr auto result = test(); - static_assert(result.index == 1); - static_assert(result.value.value == 42); + static_assert(result.index == 1, ""); + static_assert(result.value.value == 42, ""); } { struct { @@ -130,8 +130,8 @@ void test_move_ctor_basic() { } } test; constexpr auto result = test(); - static_assert(result.index == 0); - static_assert(result.value.value == 42); + static_assert(result.index == 0, ""); + static_assert(result.value.value == 42, ""); } { struct { @@ -142,8 +142,8 @@ void test_move_ctor_basic() { } } test; constexpr auto result = test(); - static_assert(result.index == 1); - static_assert(result.value.value == 42); + static_assert(result.index == 1, ""); + static_assert(result.value.value == 42, ""); } } Modified: libcxx/trunk/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp?rev=291021&r1=291020&r2=291021&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp Wed Jan 4 16:43:08 2017 @@ -489,7 +489,7 @@ void test_swap_sfinae() { // but is still swappable via the generic swap algorithm, since the // variant is move constructible and move assignable. using V = std::variant<int, NotSwappable>; - LIBCPP_STATIC_ASSERT(!has_swap_member<V>()); + LIBCPP_STATIC_ASSERT(!has_swap_member<V>(), ""); static_assert(std::is_swappable_v<V>, ""); } { @@ -569,7 +569,7 @@ void test_swap_noexcept() { // but is still swappable via the generic swap algorithm, since the // variant is move constructible and move assignable. using V = std::variant<int, NotSwappable>; - LIBCPP_STATIC_ASSERT(!has_swap_member<V>()); + LIBCPP_STATIC_ASSERT(!has_swap_member<V>(), ""); static_assert(std::is_swappable_v<V>, ""); static_assert(std::is_nothrow_swappable_v<V>, ""); V v1, v2; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits