File tree Expand file tree Collapse file tree 5 files changed +7
-9
lines changed
std/containers/sequences/list Expand file tree Collapse file tree 5 files changed +7
-9
lines changed Original file line number Diff line number Diff line change @@ -354,7 +354,7 @@ public:
354
354
355
355
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __base_pointer __as_link () {
356
356
return pointer_traits<__base_pointer>::pointer_to (
357
- *static_cast <typename pointer_traits<__base_pointer>::element_type*>(this ));
357
+ *static_cast <typename pointer_traits<__base_pointer>::element_type*>(std::addressof (* this ) ));
358
358
}
359
359
};
360
360
Original file line number Diff line number Diff line change 12
12
13
13
#include < list>
14
14
#include < cassert>
15
- #include < type_traits>
16
15
17
16
#include " test_macros.h"
18
17
#include " DefaultOnly.h"
@@ -35,7 +34,7 @@ TEST_CONSTEXPR_CXX26 bool test() {
35
34
assert (l.back () == 0 );
36
35
}
37
36
#if TEST_STD_VER >= 11
38
- if (!std::is_constant_evaluated () ) {
37
+ if (!TEST_IS_CONSTANT_EVALUATED ) {
39
38
{
40
39
std::list<DefaultOnly> l (10 );
41
40
l.resize (5 );
Original file line number Diff line number Diff line change @@ -174,7 +174,7 @@ TEST_CONSTEXPR_CXX26 void test_emplacable_concept_with_alloc() {
174
174
#endif
175
175
}
176
176
177
- TEST_CONSTEXPR_CXX26 void test_ctor_under_alloc () {
177
+ void test_ctor_under_alloc () {
178
178
#if TEST_STD_VER >= 11
179
179
int arr1[] = {42 };
180
180
int arr2[] = {1 , 101 , 42 };
@@ -205,7 +205,7 @@ TEST_CONSTEXPR_CXX26 void test_ctor_under_alloc() {
205
205
#endif
206
206
}
207
207
208
- TEST_CONSTEXPR_CXX26 void test_ctor_under_alloc_with_alloc () {
208
+ void test_ctor_under_alloc_with_alloc () {
209
209
#if TEST_STD_VER >= 11
210
210
int arr1[] = {42 };
211
211
int arr2[] = {1 , 101 , 42 };
Original file line number Diff line number Diff line change 13
13
#include < list>
14
14
#include < cassert>
15
15
#include < cstddef>
16
- #include < type_traits>
17
16
18
17
#include " test_macros.h"
19
18
#include " DefaultOnly.h"
@@ -88,7 +87,7 @@ TEST_CONSTEXPR_CXX26 bool test() {
88
87
assert (*i == 0 );
89
88
}
90
89
91
- if (!std::is_constant_evaluated () ) {
90
+ if (!TEST_IS_CONSTANT_EVALUATED ) {
92
91
{
93
92
std::list<DefaultOnly> l (3 );
94
93
assert (l.size () == 3 );
Original file line number Diff line number Diff line change @@ -28,8 +28,8 @@ struct unary_counting_predicate {
28
28
++count_;
29
29
return p_ (a);
30
30
}
31
- TEST_CONSTEXPR std::size_t count () const { return count_; }
32
- TEST_CONSTEXPR void reset () { count_ = 0 ; }
31
+ TEST_CONSTEXPR_CXX14 std::size_t count () const { return count_; }
32
+ TEST_CONSTEXPR_CXX14 void reset () { count_ = 0 ; }
33
33
34
34
private:
35
35
Predicate p_;
You can’t perform that action at this time.
0 commit comments