Author: Casey Carter Date: 2022-08-05T01:04:08-07:00 New Revision: 8cc61095c6b44b7dea0dee46acdb32ee1e4c7fd0
URL: https://github.com/llvm/llvm-project/commit/8cc61095c6b44b7dea0dee46acdb32ee1e4c7fd0 DIFF: https://github.com/llvm/llvm-project/commit/8cc61095c6b44b7dea0dee46acdb32ee1e4c7fd0.diff LOG: [libcxx][test] Test code should inspect `TEST_STD_VER`, not `_LIBCPP_STD_VER`. (cherry picked from commit a1a30dc933b928a7a8277d5b5f7bd25670e68884) Added: Modified: libcxx/test/support/test_iterators.h libcxx/test/support/test_range.h Removed: ################################################################################ diff --git a/libcxx/test/support/test_iterators.h b/libcxx/test/support/test_iterators.h index b98c35b1d0c6d..f7eee4ca3abfc 100644 --- a/libcxx/test/support/test_iterators.h +++ b/libcxx/test/support/test_iterators.h @@ -53,7 +53,7 @@ class cpp17_output_iterator template <class T> void operator,(T const &) = delete; }; -#if _LIBCPP_STD_VER > 17 +#if TEST_STD_VER > 17 static_assert(std::output_iterator<cpp17_output_iterator<int*>, int>); #endif @@ -94,7 +94,7 @@ class cpp17_input_iterator template <class T> void operator,(T const &) = delete; }; -#if _LIBCPP_STD_VER > 17 +#if TEST_STD_VER > 17 static_assert(std::input_iterator<cpp17_input_iterator<int*>>); #endif diff --git a/libcxx/test/support/test_range.h b/libcxx/test/support/test_range.h index 93fe95547e941..c1cfb9ea88929 100644 --- a/libcxx/test/support/test_range.h +++ b/libcxx/test/support/test_range.h @@ -13,7 +13,7 @@ #include "test_iterators.h" -#if _LIBCPP_STD_VER < 17 +#if TEST_STD_VER < 17 #error "test/support/test_range.h" can only be included in builds supporting ranges #endif _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
