Author: cpplearner Date: 2022-08-05T01:04:08-07:00 New Revision: 24186f723b91c8d05a269c05579aad3753bc0153
URL: https://github.com/llvm/llvm-project/commit/24186f723b91c8d05a269c05579aad3753bc0153 DIFF: https://github.com/llvm/llvm-project/commit/24186f723b91c8d05a269c05579aad3753bc0153.diff LOG: [libc++][test] Replace `_LIBCPP_STD_VER` with `TEST_STD_VER` Differential Revision: https://reviews.llvm.org/D130979 (cherry picked from commit 8a78b72289c5b1cb2ea2f0794d5bb9836b0895d8) Added: Modified: libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp Removed: ################################################################################ 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 4ed413477a8c2..40b5cdad79c5e 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 1423c6174339d..6d223632405dd 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 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
