aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCasey Carter <Casey@Carter.net>2022-08-02 12:03:25 -0700
committerTom Stellard <tstellar@redhat.com>2022-08-05 01:04:08 -0700
commit8cc61095c6b44b7dea0dee46acdb32ee1e4c7fd0 (patch)
tree2cf1d011943870313ee710d2b043686e3c979704
parent544ac3d2cc4daf6a0e121f72021f413ef9802fa7 (diff)
[libcxx][test] Test code should inspect `TEST_STD_VER`, not `_LIBCPP_STD_VER`.
(cherry picked from commit a1a30dc933b928a7a8277d5b5f7bd25670e68884)
-rw-r--r--libcxx/test/support/test_iterators.h4
-rw-r--r--libcxx/test/support/test_range.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/test/support/test_iterators.h b/libcxx/test/support/test_iterators.h
index b98c35b1d0c6..f7eee4ca3abf 100644
--- a/libcxx/test/support/test_iterators.h
+++ b/libcxx/test/support/test_iterators.h
@@ -53,7 +53,7 @@ public:
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 @@ public:
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 93fe95547e94..c1cfb9ea8892 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