Author: ericwf Date: Thu Jan 5 03:03:43 2017 New Revision: 291093 URL: http://llvm.org/viewvc/llvm-project?rev=291093&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.assign/copy.pass.cpp libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.assign/move.pass.cpp Modified: libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.assign/copy.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.assign/copy.pass.cpp?rev=291093&r1=291092&r2=291093&view=diff ============================================================================== --- libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.assign/copy.pass.cpp (original) +++ libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.assign/copy.pass.cpp Thu Jan 5 03:03:43 2017 @@ -63,7 +63,7 @@ struct TCopyAssignNTMoveAssign { int value; }; -static_assert(std::is_trivially_copy_assignable_v<TCopyAssignNTMoveAssign>); +static_assert(std::is_trivially_copy_assignable_v<TCopyAssignNTMoveAssign>, ""); void test_copy_assignment_sfinae() { { @@ -99,8 +99,8 @@ void test_copy_assignment_same_index() { } } 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 { @@ -113,8 +113,8 @@ void test_copy_assignment_same_index() { } } test; constexpr auto result = test(); - static_assert(result.index == 1); - static_assert(result.value == 42l); + static_assert(result.index == 1, ""); + static_assert(result.value == 42l, ""); } { struct { @@ -127,8 +127,8 @@ void test_copy_assignment_same_index() { } } 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 { @@ -141,8 +141,8 @@ void test_copy_assignment_same_index() { } } 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, ""); } } @@ -158,8 +158,8 @@ void test_copy_assignment_different_inde } } test; constexpr auto result = test(); - static_assert(result.index == 1); - static_assert(result.value == 42l); + static_assert(result.index == 1, ""); + static_assert(result.value == 42l, ""); } { struct { @@ -172,8 +172,8 @@ void test_copy_assignment_different_inde } } 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, ""); } } Modified: libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.assign/move.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.assign/move.pass.cpp?rev=291093&r1=291092&r2=291093&view=diff ============================================================================== --- libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.assign/move.pass.cpp (original) +++ libcxx/trunk/test/libcxx/utilities/variant/variant.variant/variant.assign/move.pass.cpp Thu Jan 5 03:03:43 2017 @@ -64,7 +64,7 @@ struct TMoveAssignNTCopyAssign { int value; }; -static_assert(std::is_trivially_move_assignable_v<TMoveAssignNTCopyAssign>); +static_assert(std::is_trivially_move_assignable_v<TMoveAssignNTCopyAssign>, ""); void test_move_assignment_sfinae() { { @@ -100,8 +100,8 @@ void test_move_assignment_same_index() { } } 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 { @@ -114,8 +114,8 @@ void test_move_assignment_same_index() { } } test; constexpr auto result = test(); - static_assert(result.index == 1); - static_assert(result.value == 42l); + static_assert(result.index == 1, ""); + static_assert(result.value == 42l, ""); } { struct { @@ -128,8 +128,8 @@ void test_move_assignment_same_index() { } } 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, ""); } } @@ -145,8 +145,8 @@ void test_move_assignment_different_inde } } test; constexpr auto result = test(); - static_assert(result.index == 1); - static_assert(result.value == 42l); + static_assert(result.index == 1, ""); + static_assert(result.value == 42l, ""); } { struct { @@ -159,8 +159,8 @@ void test_move_assignment_different_inde } } 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, ""); } } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits