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

llvm-svn: 284943
This commit is contained in:
Eric Fiselier 2016-10-23 18:55:51 +00:00
parent eca753ad92
commit 1e96d5380e
1 changed files with 4 additions and 4 deletions

View File

@ -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)));
} }
} }