Skip to content

Commit 428d378

Browse files
committed
Address ldionne's comments
1 parent 19485c9 commit 428d378

File tree

8 files changed

+8
-11
lines changed

8 files changed

+8
-11
lines changed

libcxx/include/list

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,7 @@ public:
342342
: __base(__prev, __next) {}
343343
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI ~__list_node() {}
344344

345-
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __base_pointer __as_link() {
346-
return pointer_traits<__base_pointer>::pointer_to(
347-
*static_cast<typename pointer_traits<__base_pointer>::element_type*>(std::addressof(*this)));
348-
}
345+
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __base_pointer __as_link() { return __base::__self(); }
349346
};
350347

351348
template <class _Tp, class _Alloc = allocator<_Tp> >

libcxx/test/std/containers/sequences/list/list.cons/from_range.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ TEST_CONSTEXPR_CXX26 bool test() {
2727

2828
static_assert(test_constraints<std::list, int, double>());
2929

30-
if (!std::is_constant_evaluated()) {
30+
if (!TEST_IS_CONSTANT_EVALUATED) {
3131
test_exception_safety_throwing_copy<std::list>();
3232
test_exception_safety_throwing_allocator<std::list, int>();
3333
}

libcxx/test/std/containers/sequences/list/list.cons/input_iterator.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ TEST_CONSTEXPR_CXX26 void test_emplacable_concept_with_alloc() {
174174
#endif
175175
}
176176

177-
void test_ctor_under_alloc() {
177+
TEST_CONSTEXPR_CXX26 void test_ctor_under_alloc() {
178178
#if TEST_STD_VER >= 11
179179
int arr1[] = {42};
180180
int arr2[] = {1, 101, 42};

libcxx/test/std/containers/sequences/list/list.modifiers/append_range.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ TEST_CONSTEXPR_CXX26 bool test() {
3232
});
3333
test_sequence_append_range_move_only<std::list>();
3434

35-
if (!std::is_constant_evaluated()) {
35+
if (!TEST_IS_CONSTANT_EVALUATED) {
3636
test_append_range_exception_safety_throwing_copy<std::list>();
3737
test_append_range_exception_safety_throwing_allocator<std::list, int>();
3838
}

libcxx/test/std/containers/sequences/list/list.modifiers/assign_range.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ TEST_CONSTEXPR_CXX26 bool test() {
3232
});
3333
test_sequence_assign_range_move_only<std::list>();
3434

35-
if (!std::is_constant_evaluated()) {
35+
if (!TEST_IS_CONSTANT_EVALUATED) {
3636
test_assign_range_exception_safety_throwing_copy<std::list>();
3737
test_assign_range_exception_safety_throwing_allocator<std::list, int>();
3838
}

libcxx/test/std/containers/sequences/list/list.modifiers/insert_range.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ TEST_CONSTEXPR_CXX26 bool test() {
3535
});
3636
test_sequence_insert_range_move_only<std::list>();
3737

38-
if (!std::is_constant_evaluated()) {
38+
if (!TEST_IS_CONSTANT_EVALUATED) {
3939
test_insert_range_exception_safety_throwing_copy<std::list>();
4040
test_insert_range_exception_safety_throwing_allocator<std::list, int>();
4141
}

libcxx/test/std/containers/sequences/list/list.modifiers/prepend_range.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ TEST_CONSTEXPR_CXX26 bool test() {
3232
});
3333
test_sequence_prepend_range_move_only<std::list>();
3434

35-
if (!std::is_constant_evaluated()) {
35+
if (!TEST_IS_CONSTANT_EVALUATED) {
3636
test_prepend_range_exception_safety_throwing_copy<std::list>();
3737
test_prepend_range_exception_safety_throwing_allocator<std::list, int>();
3838
}

libcxx/test/std/containers/sequences/list/list.modifiers/push_back_rvalue.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// <list>
1212

13-
// void push_back(value_type&& x); // constexpr since C++26// constexpr since C++26
13+
// void push_back(value_type&& x); // constexpr since C++26
1414

1515
#include <list>
1616
#include <cassert>

0 commit comments

Comments
 (0)