Skip to content

Commit 9120f2c

Browse files
committed
Rebase onto main to resolve conflicts
1 parent 9146e30 commit 9120f2c

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
@@ -204,6 +204,10 @@
204204
# error "__cpp_lib_constexpr_iterator should not be defined before c++20"
205205
# endif
206206

207+
# ifdef __cpp_lib_constexpr_list
208+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
209+
# endif
210+
207211
# ifdef __cpp_lib_constexpr_memory
208212
# error "__cpp_lib_constexpr_memory should not be defined before c++20"
209213
# endif
@@ -1088,6 +1092,10 @@
10881092
# error "__cpp_lib_constexpr_iterator should not be defined before c++20"
10891093
# endif
10901094

1095+
# ifdef __cpp_lib_constexpr_list
1096+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
1097+
# endif
1098+
10911099
# ifdef __cpp_lib_constexpr_memory
10921100
# error "__cpp_lib_constexpr_memory should not be defined before c++20"
10931101
# endif
@@ -2074,6 +2082,10 @@
20742082
# error "__cpp_lib_constexpr_iterator should not be defined before c++20"
20752083
# endif
20762084

2085+
# ifdef __cpp_lib_constexpr_list
2086+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
2087+
# endif
2088+
20772089
# ifdef __cpp_lib_constexpr_memory
20782090
# error "__cpp_lib_constexpr_memory should not be defined before c++20"
20792091
# endif
@@ -3306,6 +3318,10 @@
33063318
# error "__cpp_lib_constexpr_iterator should have the value 201811L in c++20"
33073319
# endif
33083320

3321+
# ifdef __cpp_lib_constexpr_list
3322+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
3323+
# endif
3324+
33093325
# ifndef __cpp_lib_constexpr_memory
33103326
# error "__cpp_lib_constexpr_memory should be defined in c++20"
33113327
# endif
@@ -4754,6 +4770,10 @@
47544770
# error "__cpp_lib_constexpr_iterator should have the value 201811L in c++23"
47554771
# endif
47564772

4773+
# ifdef __cpp_lib_constexpr_list
4774+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
4775+
# endif
4776+
47574777
# ifndef __cpp_lib_constexpr_memory
47584778
# error "__cpp_lib_constexpr_memory should be defined in c++23"
47594779
# endif
@@ -6421,6 +6441,13 @@
64216441
# error "__cpp_lib_constexpr_iterator should have the value 201811L in c++26"
64226442
# endif
64236443

6444+
# ifndef __cpp_lib_constexpr_list
6445+
# error "__cpp_lib_constexpr_list should be defined in c++26"
6446+
# endif
6447+
# if __cpp_lib_constexpr_list != 202502L
6448+
# error "__cpp_lib_constexpr_list should have the value 202502L in c++26"
6449+
# endif
6450+
64246451
# ifndef __cpp_lib_constexpr_memory
64256452
# error "__cpp_lib_constexpr_memory should be defined in c++26"
64266453
# endif

0 commit comments

Comments
 (0)