Skip to content

Commit e8025b4

Browse files
randomnetcatrandomnetcat
committed
Bump __cpp_lib_concepts
1 parent f26596a commit e8025b4

File tree

5 files changed

+23
-29
lines changed

5 files changed

+23
-29
lines changed

‎libcxx/docs/FeatureTestMacroTable.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,6 @@ Status
198198
---------------------------------------------------------- -----------------
199199
``__cpp_lib_char8_t`` ``201907L``
200200
---------------------------------------------------------- -----------------
201-
``__cpp_lib_concepts`` ``202002L``
202-
---------------------------------------------------------- -----------------
203201
``__cpp_lib_constexpr_algorithms`` ``201806L``
204202
---------------------------------------------------------- -----------------
205203
``__cpp_lib_constexpr_complex`` ``201711L``
@@ -316,6 +314,8 @@ Status
316314
---------------------------------------------------------- -----------------
317315
``__cpp_lib_byteswap`` ``202110L``
318316
---------------------------------------------------------- -----------------
317+
``__cpp_lib_concepts`` ``202207L``
318+
---------------------------------------------------------- -----------------
319319
``__cpp_lib_constexpr_bitset`` ``202207L``
320320
---------------------------------------------------------- -----------------
321321
``__cpp_lib_constexpr_charconv`` ``202207L``

‎libcxx/include/version

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ __cpp_lib_chrono 201611L <chrono>
6060
__cpp_lib_chrono_udls 201304L <chrono>
6161
__cpp_lib_clamp 201603L <algorithm>
6262
__cpp_lib_complex_udls 201309L <complex>
63-
__cpp_lib_concepts 202002L <concepts>
63+
__cpp_lib_concepts 202207L <concepts>
6464
__cpp_lib_constexpr_algorithms 202306L <algorithm> <utility>
6565
201806L // C++20
6666
__cpp_lib_constexpr_bitset 202207L <bitset>
@@ -400,7 +400,6 @@ __cpp_lib_void_t 201411L <type_traits>
400400
# if _LIBCPP_HAS_CHAR8_T
401401
# define __cpp_lib_char8_t 201907L
402402
# endif
403-
# define __cpp_lib_concepts 202002L
404403
# define __cpp_lib_constexpr_algorithms 201806L
405404
# define __cpp_lib_constexpr_complex 201711L
406405
# define __cpp_lib_constexpr_dynamic_alloc 201907L
@@ -480,6 +479,7 @@ __cpp_lib_void_t 201411L <type_traits>
480479
// # define __cpp_lib_associative_heterogeneous_erasure 202110L
481480
# define __cpp_lib_bind_back 202202L
482481
# define __cpp_lib_byteswap 202110L
482+
# define __cpp_lib_concepts 202207L
483483
# define __cpp_lib_constexpr_bitset 202207L
484484
# define __cpp_lib_constexpr_charconv 202207L
485485
// # define __cpp_lib_constexpr_cmath 202202L

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,46 +21,43 @@
2121
#if TEST_STD_VER < 14
2222

2323
# ifdef __cpp_lib_concepts
24-
# error "__cpp_lib_concepts should not be defined before c++20"
24+
# error "__cpp_lib_concepts should not be defined before c++23"
2525
# endif
2626

2727
#elif TEST_STD_VER == 14
2828

2929
# ifdef __cpp_lib_concepts
30-
# error "__cpp_lib_concepts should not be defined before c++20"
30+
# error "__cpp_lib_concepts should not be defined before c++23"
3131
# endif
3232

3333
#elif TEST_STD_VER == 17
3434

3535
# ifdef __cpp_lib_concepts
36-
# error "__cpp_lib_concepts should not be defined before c++20"
36+
# error "__cpp_lib_concepts should not be defined before c++23"
3737
# endif
3838

3939
#elif TEST_STD_VER == 20
4040

41-
# ifndef __cpp_lib_concepts
42-
# error "__cpp_lib_concepts should be defined in c++20"
43-
# endif
44-
# if __cpp_lib_concepts != 202002L
45-
# error "__cpp_lib_concepts should have the value 202002L in c++20"
41+
# ifdef __cpp_lib_concepts
42+
# error "__cpp_lib_concepts should not be defined before c++23"
4643
# endif
4744

4845
#elif TEST_STD_VER == 23
4946

5047
# ifndef __cpp_lib_concepts
5148
# error "__cpp_lib_concepts should be defined in c++23"
5249
# endif
53-
# if __cpp_lib_concepts != 202002L
54-
# error "__cpp_lib_concepts should have the value 202002L in c++23"
50+
# if __cpp_lib_concepts != 202207L
51+
# error "__cpp_lib_concepts should have the value 202207L in c++23"
5552
# endif
5653

5754
#elif TEST_STD_VER > 23
5855

5956
# ifndef __cpp_lib_concepts
6057
# error "__cpp_lib_concepts should be defined in c++26"
6158
# endif
62-
# if __cpp_lib_concepts != 202002L
63-
# error "__cpp_lib_concepts should have the value 202002L in c++26"
59+
# if __cpp_lib_concepts != 202207L
60+
# error "__cpp_lib_concepts should have the value 202207L in c++26"
6461
# endif
6562

6663
#endif // TEST_STD_VER > 23

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
# endif
170170

171171
# ifdef __cpp_lib_concepts
172-
# error "__cpp_lib_concepts should not be defined before c++20"
172+
# error "__cpp_lib_concepts should not be defined before c++23"
173173
# endif
174174

175175
# ifdef __cpp_lib_constexpr_algorithms
@@ -1057,7 +1057,7 @@
10571057
# endif
10581058

10591059
# ifdef __cpp_lib_concepts
1060-
# error "__cpp_lib_concepts should not be defined before c++20"
1060+
# error "__cpp_lib_concepts should not be defined before c++23"
10611061
# endif
10621062

10631063
# ifdef __cpp_lib_constexpr_algorithms
@@ -2047,7 +2047,7 @@
20472047
# endif
20482048

20492049
# ifdef __cpp_lib_concepts
2050-
# error "__cpp_lib_concepts should not be defined before c++20"
2050+
# error "__cpp_lib_concepts should not be defined before c++23"
20512051
# endif
20522052

20532053
# ifdef __cpp_lib_constexpr_algorithms
@@ -3264,11 +3264,8 @@
32643264
# error "__cpp_lib_complex_udls should have the value 201309L in c++20"
32653265
# endif
32663266

3267-
# ifndef __cpp_lib_concepts
3268-
# error "__cpp_lib_concepts should be defined in c++20"
3269-
# endif
3270-
# if __cpp_lib_concepts != 202002L
3271-
# error "__cpp_lib_concepts should have the value 202002L in c++20"
3267+
# ifdef __cpp_lib_concepts
3268+
# error "__cpp_lib_concepts should not be defined before c++23"
32723269
# endif
32733270

32743271
# ifndef __cpp_lib_constexpr_algorithms
@@ -4704,8 +4701,8 @@
47044701
# ifndef __cpp_lib_concepts
47054702
# error "__cpp_lib_concepts should be defined in c++23"
47064703
# endif
4707-
# if __cpp_lib_concepts != 202002L
4708-
# error "__cpp_lib_concepts should have the value 202002L in c++23"
4704+
# if __cpp_lib_concepts != 202207L
4705+
# error "__cpp_lib_concepts should have the value 202207L in c++23"
47094706
# endif
47104707

47114708
# ifndef __cpp_lib_constexpr_algorithms
@@ -6375,8 +6372,8 @@
63756372
# ifndef __cpp_lib_concepts
63766373
# error "__cpp_lib_concepts should be defined in c++26"
63776374
# endif
6378-
# if __cpp_lib_concepts != 202002L
6379-
# error "__cpp_lib_concepts should have the value 202002L in c++26"
6375+
# if __cpp_lib_concepts != 202207L
6376+
# error "__cpp_lib_concepts should have the value 202207L in c++26"
63806377
# endif
63816378

63826379
# ifndef __cpp_lib_constexpr_algorithms

‎libcxx/utils/generate_feature_test_macro_components.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ def add_version_header(tc):
320320
},
321321
{
322322
"name": "__cpp_lib_concepts",
323-
"values": {"c++20": 202002},
323+
"values": {"c++23": 202207},
324324
"headers": ["concepts"],
325325
},
326326
{

0 commit comments

Comments
 (0)