Skip to content

Commit 2956fc8

Browse files
committed
Rebase onto main to resolve conflicts
1 parent e076836 commit 2956fc8

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
@@ -1092,6 +1096,10 @@
10921096
# error "__cpp_lib_constexpr_iterator should not be defined before c++20"
10931097
# endif
10941098

1099+
# ifdef __cpp_lib_constexpr_list
1100+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
1101+
# endif
1102+
10951103
# ifdef __cpp_lib_constexpr_memory
10961104
# error "__cpp_lib_constexpr_memory should not be defined before c++20"
10971105
# endif
@@ -2082,6 +2090,10 @@
20822090
# error "__cpp_lib_constexpr_iterator should not be defined before c++20"
20832091
# endif
20842092

2093+
# ifdef __cpp_lib_constexpr_list
2094+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
2095+
# endif
2096+
20852097
# ifdef __cpp_lib_constexpr_memory
20862098
# error "__cpp_lib_constexpr_memory should not be defined before c++20"
20872099
# endif
@@ -3318,6 +3330,10 @@
33183330
# error "__cpp_lib_constexpr_iterator should have the value 201811L in c++20"
33193331
# endif
33203332

3333+
# ifdef __cpp_lib_constexpr_list
3334+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
3335+
# endif
3336+
33213337
# ifndef __cpp_lib_constexpr_memory
33223338
# error "__cpp_lib_constexpr_memory should be defined in c++20"
33233339
# endif
@@ -4770,6 +4786,10 @@
47704786
# error "__cpp_lib_constexpr_iterator should have the value 201811L in c++23"
47714787
# endif
47724788

4789+
# ifdef __cpp_lib_constexpr_list
4790+
# error "__cpp_lib_constexpr_list should not be defined before c++26"
4791+
# endif
4792+
47734793
# ifndef __cpp_lib_constexpr_memory
47744794
# error "__cpp_lib_constexpr_memory should be defined in c++23"
47754795
# endif
@@ -6441,6 +6461,13 @@
64416461
# error "__cpp_lib_constexpr_iterator should have the value 201811L in c++26"
64426462
# endif
64436463

6464+
# ifndef __cpp_lib_constexpr_list
6465+
# error "__cpp_lib_constexpr_list should be defined in c++26"
6466+
# endif
6467+
# if __cpp_lib_constexpr_list != 202502L
6468+
# error "__cpp_lib_constexpr_list should have the value 202502L in c++26"
6469+
# endif
6470+
64446471
# ifndef __cpp_lib_constexpr_memory
64456472
# error "__cpp_lib_constexpr_memory should be defined in c++26"
64466473
# endif

0 commit comments

Comments
 (0)