File tree Expand file tree Collapse file tree 3 files changed +7
-8
lines changed
algorithms/alg.modifying.operations
utilities/utility/utility.swap Expand file tree Collapse file tree 3 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -438,9 +438,8 @@ TEST_CONSTEXPR_CXX20 bool test_vector_bool() {
438438TEST_CONSTEXPR_CXX20 bool test () {
439439 types::for_each (types::forward_iterator_list<int *>(), TestIter ());
440440
441- #if TEST_STD_VER >= 11
442- if (TEST_STD_VER >= 23 || !TEST_IS_CONSTANT_EVALUATED)
443- types::for_each (types::forward_iterator_list<std::unique_ptr<int >*>(), TestUniquePtr ());
441+ #if TEST_STD_VER >= 11 && TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED
442+ types::for_each (types::forward_iterator_list<std::unique_ptr<int >*>(), TestUniquePtr ());
444443#endif
445444
446445 test_vector_bool<8 >();
Original file line number Diff line number Diff line change @@ -142,10 +142,9 @@ TEST_CONSTEXPR_CXX20 bool test() {
142142
143143 types::for_each (types::forward_iterator_list<int *>(), TestPtr ());
144144
145- #if TEST_STD_VER >= 11
145+ #if TEST_STD_VER >= 11 && TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED
146146 // We can't test unique_ptr in constant evaluation before C++23 as it's constexpr only since C++23.
147- if (TEST_STD_VER >= 23 || !TEST_IS_CONSTANT_EVALUATED)
148- types::for_each (types::forward_iterator_list<std::unique_ptr<int >*>(), TestUniquePtr ());
147+ types::for_each (types::forward_iterator_list<std::unique_ptr<int >*>(), TestUniquePtr ());
149148#endif
150149
151150 { // Test vector<bool>::iterator optimization
Original file line number Diff line number Diff line change @@ -137,8 +137,9 @@ TEST_CONSTEXPR_CXX20 bool test() {
137137 static_assert (noexcept (std::swap (ma, ma)), " " );
138138 }
139139
140- if (TEST_STD_VER >= 23 || !TEST_IS_CONSTANT_EVALUATED)
141- test_unique_ptr ();
140+ # if TEST_STD_AT_LEAST_23_OR_RUNTIME_EVALUATED
141+ test_unique_ptr ();
142+ # endif
142143#endif
143144
144145 return true ;
You can’t perform that action at this time.
0 commit comments