[libcxx] r284943 - Make make_from_tuple tests more portable. Patch from STL at microsoft.com

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Sun Oct 23 11:55:51 PDT 2016


Author: ericwf
Date: Sun Oct 23 13:55:51 2016
New Revision: 284943

URL: http://llvm.org/viewvc/llvm-project?rev=284943&view=rev
Log:
Make make_from_tuple tests more portable. Patch from STL at microsoft.com

Modified:
    libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp

Modified: libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp?rev=284943&r1=284942&r2=284943&view=diff
==============================================================================
--- libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp (original)
+++ libcxx/trunk/test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp Sun Oct 23 13:55:51 2016
@@ -175,14 +175,14 @@ void test_noexcept() {
         Tuple tup; ((void)tup);
         Tuple const& ctup = tup; ((void)ctup);
         ASSERT_NOT_NOEXCEPT(std::make_from_tuple<TestType>(ctup));
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(std::move(tup)));
+        LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(std::move(tup))));
     }
     {
         using Tuple = std::pair<int, NothrowMoveable>;
         Tuple tup; ((void)tup);
         Tuple const& ctup = tup; ((void)ctup);
         ASSERT_NOT_NOEXCEPT(std::make_from_tuple<TestType>(ctup));
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(std::move(tup)));
+        LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(std::move(tup))));
     }
     {
         using Tuple = std::tuple<int, int, int>;
@@ -192,7 +192,7 @@ void test_noexcept() {
     {
         using Tuple = std::tuple<long, long, long>;
         Tuple tup; ((void)tup);
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup));
+        LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup)));
     }
     {
         using Tuple = std::array<int, 3>;
@@ -202,7 +202,7 @@ void test_noexcept() {
     {
         using Tuple = std::array<long, 3>;
         Tuple tup; ((void)tup);
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup));
+        LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup)));
     }
 }
 




More information about the cfe-commits mailing list