From 9c6b70a0afc86ebdcff070ca5020497df5d62889 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Wed, 4 Jan 2017 22:43:08 +0000 Subject: [PATCH] Use C++11 static_assert in variant tests. Patch from Michael Park git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@291021 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../variant.ctor/copy.pass.cpp | 36 +++++++++---------- .../variant.ctor/move.pass.cpp | 24 ++++++------- .../variant.swap/swap.pass.cpp | 4 +-- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/test/libcxx/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp b/test/libcxx/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp index 59c433050..0d30a78a4 100644 --- a/test/libcxx/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp +++ b/test/libcxx/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp @@ -72,45 +72,45 @@ void test_copy_ctor_sfinae() { void test_copy_ctor_basic() { { constexpr std::variant v(std::in_place_index<0>, 42); - static_assert(v.index() == 0); + static_assert(v.index() == 0, ""); constexpr std::variant 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 v(std::in_place_index<1>, 42); - static_assert(v.index() == 1); + static_assert(v.index() == 1, ""); constexpr std::variant 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 v(std::in_place_index<0>, 42); - static_assert(v.index() == 0); + static_assert(v.index() == 0, ""); constexpr std::variant 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 v(std::in_place_index<1>, 42); - static_assert(v.index() == 1); + static_assert(v.index() == 1, ""); constexpr std::variant 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 v(std::in_place_index<0>, 42); - static_assert(v.index() == 0); + static_assert(v.index() == 0, ""); constexpr std::variant 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 v(std::in_place_index<1>, 42); - static_assert(v.index() == 1); + static_assert(v.index() == 1, ""); constexpr std::variant 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, ""); } } diff --git a/test/libcxx/utilities/variant/variant.variant/variant.ctor/move.pass.cpp b/test/libcxx/utilities/variant/variant.variant/variant.ctor/move.pass.cpp index e67a495d9..91e8c194d 100644 --- a/test/libcxx/utilities/variant/variant.variant/variant.ctor/move.pass.cpp +++ b/test/libcxx/utilities/variant/variant.variant/variant.ctor/move.pass.cpp @@ -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, ""); } } diff --git a/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp b/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp index 416c6b4e3..48cda2220 100644 --- a/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp +++ b/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp @@ -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; - LIBCPP_STATIC_ASSERT(!has_swap_member()); + LIBCPP_STATIC_ASSERT(!has_swap_member(), ""); static_assert(std::is_swappable_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; - LIBCPP_STATIC_ASSERT(!has_swap_member()); + LIBCPP_STATIC_ASSERT(!has_swap_member(), ""); static_assert(std::is_swappable_v, ""); static_assert(std::is_nothrow_swappable_v, ""); V v1, v2;