Browse Source

Make make_from_tuple tests more portable. Patch from STL@microsoft.com

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@284943 91177308-0d34-0410-b5e6-96231b3b80d8
Eric Fiselier 8 years ago
parent
commit
26cbb8d03e

+ 4 - 4
test/std/utilities/tuple/tuple.tuple/tuple.apply/make_from_tuple.pass.cpp

@@ -175,14 +175,14 @@ void test_noexcept() {
         Tuple tup; ((void)tup);
         Tuple tup; ((void)tup);
         Tuple const& ctup = tup; ((void)ctup);
         Tuple const& ctup = tup; ((void)ctup);
         ASSERT_NOT_NOEXCEPT(std::make_from_tuple<TestType>(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>;
         using Tuple = std::pair<int, NothrowMoveable>;
         Tuple tup; ((void)tup);
         Tuple tup; ((void)tup);
         Tuple const& ctup = tup; ((void)ctup);
         Tuple const& ctup = tup; ((void)ctup);
         ASSERT_NOT_NOEXCEPT(std::make_from_tuple<TestType>(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>;
         using Tuple = std::tuple<int, int, int>;
@@ -192,7 +192,7 @@ void test_noexcept() {
     {
     {
         using Tuple = std::tuple<long, long, long>;
         using Tuple = std::tuple<long, long, long>;
         Tuple tup; ((void)tup);
         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>;
         using Tuple = std::array<int, 3>;
@@ -202,7 +202,7 @@ void test_noexcept() {
     {
     {
         using Tuple = std::array<long, 3>;
         using Tuple = std::array<long, 3>;
         Tuple tup; ((void)tup);
         Tuple tup; ((void)tup);
-        ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup));
+        LIBCPP_ONLY(ASSERT_NOEXCEPT(std::make_from_tuple<TestType>(tup)));
     }
     }
 }
 }