Skip to content

Commit 3fc15e7

Browse files
Fix: Add TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED.
1 parent 75e0cd8 commit 3fc15e7

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ struct Test1OutIters {
9494

9595
TEST_CONSTEXPR_CXX20 bool test() {
9696
types::for_each(types::cpp17_input_iterator_list<int*>(), TestOutIters());
97-
if (TEST_STD_VER >= 23 || !TEST_IS_CONSTANT_EVALUATED)
97+
if (TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED)
9898
types::for_each(types::cpp17_input_iterator_list<std::unique_ptr<int>*>(), Test1OutIters());
9999

100100
{ // Make sure that padding bits aren't copied

libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ struct Test1OutIters {
9292

9393
TEST_CONSTEXPR_CXX20 bool test() {
9494
types::for_each(types::bidirectional_iterator_list<int*>(), TestOutIters());
95-
if (TEST_STD_VER >= 23 || !TEST_IS_CONSTANT_EVALUATED)
95+
if (TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED)
9696
types::for_each(types::bidirectional_iterator_list<std::unique_ptr<int>*>(), Test1OutIters());
9797

9898
{ // Make sure that padding bits aren't copied

libcxx/test/support/test_macros.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,12 @@
151151
# define TEST_IS_CONSTANT_EVALUATED false
152152
#endif
153153

154+
#if TEST_STD_VER >= 23
155+
# define TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED true
156+
#else
157+
# define TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED (!TEST_IS_CONSTANT_EVALUATED)
158+
#endif
159+
154160
#if TEST_STD_VER >= 14
155161
# define TEST_CONSTEXPR_CXX14 constexpr
156162
#else

0 commit comments

Comments
 (0)