Use C++11 static_assert in variant tests. Patch from Michael Park

llvm-svn: 291093

2 files changed, 24 insertions, 24 deletions

diff --git a/libcxx/test/libcxx/utilities/variant/variant.variant/variant.assign/copy.pass.cpp b/libcxx/test/libcxx/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
index a94aa2f7829..ff96d21fe95 100644
--- a/libcxx/test/libcxx/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
+++ b/libcxx/test/libcxx/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
@@ -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_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 {
@@ -172,8 +172,8 @@ void test_copy_assignment_different_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, "");
   }
 }
 
diff --git a/libcxx/test/libcxx/utilities/variant/variant.variant/variant.assign/move.pass.cpp b/libcxx/test/libcxx/utilities/variant/variant.variant/variant.assign/move.pass.cpp
index a3d92472dd5..430ed3ff77d 100644
--- a/libcxx/test/libcxx/utilities/variant/variant.variant/variant.assign/move.pass.cpp
+++ b/libcxx/test/libcxx/utilities/variant/variant.variant/variant.assign/move.pass.cpp
@@ -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_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 {
@@ -159,8 +159,8 @@ void test_move_assignment_different_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, "");
   }
 }