[libcxx] r276608 - Remove use of C++1z static assert in C++11 test

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Sun Jul 24 21:56:33 PDT 2016


Author: ericwf
Date: Sun Jul 24 23:56:32 2016
New Revision: 276608

URL: http://llvm.org/viewvc/llvm-project?rev=276608&view=rev
Log:
Remove use of C++1z static assert in C++11 test

Modified:
    libcxx/trunk/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp

Modified: libcxx/trunk/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp?rev=276608&r1=276607&r2=276608&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp (original)
+++ libcxx/trunk/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp Sun Jul 24 23:56:32 2016
@@ -32,10 +32,10 @@ namespace ConstructorTest {
 template <class T1, bool CanCopy = true, bool CanMove = CanCopy> void test() {
   using P1 = std::pair<T1, int>;
   using P2 = std::pair<int, T1>;
-  static_assert(std::is_copy_constructible<P1>::value == CanCopy);
-  static_assert(std::is_move_constructible<P1>::value == CanMove);
-  static_assert(std::is_copy_constructible<P2>::value == CanCopy);
-  static_assert(std::is_move_constructible<P2>::value == CanMove);
+  static_assert(std::is_copy_constructible<P1>::value == CanCopy, "");
+  static_assert(std::is_move_constructible<P1>::value == CanMove, "");
+  static_assert(std::is_copy_constructible<P2>::value == CanCopy, "");
+  static_assert(std::is_move_constructible<P2>::value == CanMove, "");
 };
 
 } // namespace ConstructorTest
@@ -80,10 +80,10 @@ namespace AssignmentOperatorTest {
 template <class T1, bool CanCopy = true, bool CanMove = CanCopy> void test() {
   using P1 = std::pair<T1, int>;
   using P2 = std::pair<int, T1>;
-  static_assert(std::is_copy_assignable<P1>::value == CanCopy);
-  static_assert(std::is_move_assignable<P1>::value == CanMove);
-  static_assert(std::is_copy_assignable<P2>::value == CanCopy);
-  static_assert(std::is_move_assignable<P2>::value == CanMove);
+  static_assert(std::is_copy_assignable<P1>::value == CanCopy, "");
+  static_assert(std::is_move_assignable<P1>::value == CanMove, "");
+  static_assert(std::is_copy_assignable<P2>::value == CanCopy, "");
+  static_assert(std::is_move_assignable<P2>::value == CanMove, "");
 };
 
 } // namespace AssignmentOperatorTest




More information about the cfe-commits mailing list