diff options
Diffstat (limited to 'test/std/utilities/tuple/tuple.tuple/tuple.creation')
4 files changed, 12 insertions, 5 deletions
diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp index 2dbe81513a1a..1099e3579687 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.creation/forward_as_tuple.pass.cpp @@ -18,6 +18,8 @@ #include <type_traits> #include <cassert> +#include "test_macros.h" + template <class Tuple> void test0(const Tuple&) @@ -54,7 +56,7 @@ test2a(const Tuple& t) assert(std::get<1>(t) == 'a'); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 template <class Tuple> constexpr int test3(const Tuple&) @@ -79,7 +81,7 @@ int main() double i = 2.5; char c = 'a'; test2a(std::forward_as_tuple(i, c)); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert ( test3 (std::forward_as_tuple(i, c)) == 2, "" ); #endif } diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp index f27e8a09fb97..2c38bf7d230c 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.creation/make_tuple.pass.cpp @@ -20,6 +20,8 @@ #include <functional> #include <cassert> +#include "test_macros.h" + int main() { { @@ -40,7 +42,7 @@ int main() assert(i == 0); assert(j == 0); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr auto t1 = std::make_tuple(0, 1, 3.14); constexpr int i1 = std::get<1>(t1); diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp index 52ecd249402f..c4c3c242d8f8 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.creation/tie.pass.cpp @@ -20,6 +20,8 @@ #include <string> #include <cassert> +#include "test_macros.h" + int main() { { @@ -29,7 +31,7 @@ int main() assert(i == 42); assert(s == "C++"); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { static constexpr int i = 42; static constexpr double f = 1.1; diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp index 770edcaca5e1..18095f7e3033 100644 --- a/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp +++ b/test/std/utilities/tuple/tuple.tuple/tuple.creation/tuple_cat.pass.cpp @@ -21,6 +21,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" int main() @@ -48,7 +49,7 @@ int main() assert(std::get<0>(t) == 1); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::tuple<> t = std::tuple_cat(); ((void)t); // Prevent unused warning |