Skip to content

Commit 19485c9

Browse files
committed
Rebase onto main to resolve conflicts
1 parent b13b045 commit 19485c9

File tree

2 files changed

+54
-0
lines changed

2 files changed

+54
-0
lines changed

libcxx/test/std/language.support/support.limits/support.limits.general/list.version.compile.pass.cpp

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
# error "__cpp_lib_allocator_traits_is_always_equal should not be defined before c++17"
2525
# endif
2626

27+
# ifdef __cpp_lib_constexpr_list
28+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
29+
# endif
30+
2731
# ifdef __cpp_lib_containers_ranges
2832
# error "__cpp_lib_containers_ranges should not be defined before c++23"
2933
# endif
@@ -54,6 +58,10 @@
5458
# error "__cpp_lib_allocator_traits_is_always_equal should not be defined before c++17"
5559
# endif
5660

61+
# ifdef __cpp_lib_constexpr_list
62+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
63+
# endif
64+
5765
# ifdef __cpp_lib_containers_ranges
5866
# error "__cpp_lib_containers_ranges should not be defined before c++23"
5967
# endif
@@ -87,6 +95,10 @@
8795
# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++17"
8896
# endif
8997

98+
# ifdef __cpp_lib_constexpr_list
99+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
100+
# endif
101+
90102
# ifdef __cpp_lib_containers_ranges
91103
# error "__cpp_lib_containers_ranges should not be defined before c++23"
92104
# endif
@@ -126,6 +138,10 @@
126138
# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++20"
127139
# endif
128140

141+
# ifdef __cpp_lib_constexpr_list
142+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
143+
# endif
144+
129145
# ifdef __cpp_lib_containers_ranges
130146
# error "__cpp_lib_containers_ranges should not be defined before c++23"
131147
# endif
@@ -171,6 +187,10 @@
171187
# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++23"
172188
# endif
173189

190+
# ifdef __cpp_lib_constexpr_list
191+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
192+
# endif
193+
174194
# ifndef __cpp_lib_containers_ranges
175195
# error "__cpp_lib_containers_ranges should be defined in c++23"
176196
# endif
@@ -219,6 +239,13 @@
219239
# error "__cpp_lib_allocator_traits_is_always_equal should have the value 201411L in c++26"
220240
# endif
221241

242+
# ifndef __cpp_lib_constexpr_list
243+
# error "__cpp_lib_constexpr_list should be defined in c++26"
244+
# endif
245+
# if __cpp_lib_constexpr_list != 202502L
246+
# error "__cpp_lib_constexpr_list should have the value 202502L in c++26"
247+
# endif
248+
222249
# ifndef __cpp_lib_containers_ranges
223250
# error "__cpp_lib_containers_ranges should be defined in c++26"
224251
# endif

libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,10 @@
208208
# error "__cpp_lib_constexpr_iterator should not be defined before c++20"
209209
# endif
210210

211+
# ifdef __cpp_lib_constexpr_list
212+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
213+
# endif
214+
211215
# ifdef __cpp_lib_constexpr_memory
212216
# error "__cpp_lib_constexpr_memory should not be defined before c++20"
213217
# endif
@@ -1100,6 +1104,10 @@
11001104
# error "__cpp_lib_constexpr_iterator should not be defined before c++20"
11011105
# endif
11021106

1107+
# ifdef __cpp_lib_constexpr_list
1108+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
1109+
# endif
1110+
11031111
# ifdef __cpp_lib_constexpr_memory
11041112
# error "__cpp_lib_constexpr_memory should not be defined before c++20"
11051113
# endif
@@ -2094,6 +2102,10 @@
20942102
# error "__cpp_lib_constexpr_iterator should not be defined before c++20"
20952103
# endif
20962104

2105+
# ifdef __cpp_lib_constexpr_list
2106+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
2107+
# endif
2108+
20972109
# ifdef __cpp_lib_constexpr_memory
20982110
# error "__cpp_lib_constexpr_memory should not be defined before c++20"
20992111
# endif
@@ -3334,6 +3346,10 @@
33343346
# error "__cpp_lib_constexpr_iterator should have the value 201811L in c++20"
33353347
# endif
33363348

3349+
# ifdef __cpp_lib_constexpr_list
3350+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
3351+
# endif
3352+
33373353
# ifndef __cpp_lib_constexpr_memory
33383354
# error "__cpp_lib_constexpr_memory should be defined in c++20"
33393355
# endif
@@ -4790,6 +4806,10 @@
47904806
# error "__cpp_lib_constexpr_iterator should have the value 201811L in c++23"
47914807
# endif
47924808

4809+
# ifdef __cpp_lib_constexpr_list
4810+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
4811+
# endif
4812+
47934813
# ifndef __cpp_lib_constexpr_memory
47944814
# error "__cpp_lib_constexpr_memory should be defined in c++23"
47954815
# endif
@@ -6468,6 +6488,13 @@
64686488
# error "__cpp_lib_constexpr_iterator should have the value 201811L in c++26"
64696489
# endif
64706490

6491+
# ifndef __cpp_lib_constexpr_list
6492+
# error "__cpp_lib_constexpr_list should be defined in c++26"
6493+
# endif
6494+
# if __cpp_lib_constexpr_list != 202502L
6495+
# error "__cpp_lib_constexpr_list should have the value 202502L in c++26"
6496+
# endif
6497+
64716498
# ifndef __cpp_lib_constexpr_memory
64726499
# error "__cpp_lib_constexpr_memory should be defined in c++26"
64736500
# endif

0 commit comments

Comments
 (0)