aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcpplearner <cpplearner@outlook.com>2022-08-02 18:38:17 +0800
committerTom Stellard <tstellar@redhat.com>2022-08-05 01:04:08 -0700
commit24186f723b91c8d05a269c05579aad3753bc0153 (patch)
tree24a9aa97a3105cbddbca65c6430f6b1f793b3124
parent732cb12370d9944fbb50e8fa2db9b8f0786d1531 (diff)
[libc++][test] Replace `_LIBCPP_STD_VER` with `TEST_STD_VER`
Differential Revision: https://reviews.llvm.org/D130979 (cherry picked from commit 8a78b72289c5b1cb2ea2f0794d5bb9836b0895d8)
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp4
-rw-r--r--libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
index 4ed413477a8c..40b5cdad79c5 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
@@ -36,7 +36,7 @@ struct Implicit {
Implicit(int x) : value(x) {}
};
-#if _LIBCPP_STD_VER > 17
+#if TEST_STD_VER > 17
constexpr bool alloc_copy_constructor_is_constexpr() {
const std::tuple<int> t1 = 1;
std::tuple<int> t2 = {std::allocator_arg, test_allocator<int>{}, t1};
@@ -106,7 +106,7 @@ int main(int, char**)
std::tuple<long long> t0(derived, A1<int>(), from);
}
-#if _LIBCPP_STD_VER > 17
+#if TEST_STD_VER > 17
static_assert(alloc_copy_constructor_is_constexpr());
#endif
return 0;
diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
index 1423c6174339..6d223632405d 100644
--- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
+++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
@@ -51,7 +51,7 @@ struct Implicit {
Implicit(int x) : value(x) {}
};
-#if _LIBCPP_STD_VER > 17
+#if TEST_STD_VER > 17
constexpr bool alloc_move_constructor_is_constexpr() {
std::tuple<int> t1 = 1;
std::tuple<int> t2 = {std::allocator_arg, test_allocator<int>{}, std::move(t1)};
@@ -119,7 +119,7 @@ int main(int, char**)
std::tuple<long long> t0(derived, A1<int>(), std::move(from));
}
-#if _LIBCPP_STD_VER > 17
+#if TEST_STD_VER > 17
static_assert(alloc_move_constructor_is_constexpr());
#endif