Skip to content

Commit

Permalink
Run the generate scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
dalg24 committed Jan 12, 2025
1 parent 2766103 commit e36bc1c
Show file tree
Hide file tree
Showing 6 changed files with 128 additions and 2 deletions.
4 changes: 2 additions & 2 deletions libcxx/docs/FeatureTestMacroTable.rst
Original file line number Diff line number Diff line change
Expand Up @@ -404,10 +404,10 @@ Status
---------------------------------------------------------- -----------------
**C++26**
----------------------------------------------------------------------------
``__cpp_lib_associative_heterogeneous_insertion`` *unimplemented*
---------------------------------------------------------- -----------------
``__cpp_lib_aligned_accessor`` ``202411L``
---------------------------------------------------------- -----------------
``__cpp_lib_associative_heterogeneous_insertion`` *unimplemented*
---------------------------------------------------------- -----------------
``__cpp_lib_atomic_min_max`` *unimplemented*
---------------------------------------------------------- -----------------
``__cpp_lib_bind_front`` ``202306L``
Expand Down
4 changes: 4 additions & 0 deletions libcxx/include/version
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
Macro name Value Headers
__cpp_lib_adaptor_iterator_pair_constructor 202106L <queue> <stack>
__cpp_lib_addressof_constexpr 201603L <memory>
__cpp_lib_aligned_accessor 202411L <mdspan>
__cpp_lib_allocate_at_least 202302L <memory>
__cpp_lib_allocator_traits_is_always_equal 201411L <deque> <forward_list> <list>
<map> <memory> <scoped_allocator>
Expand Down Expand Up @@ -145,6 +146,7 @@ __cpp_lib_is_nothrow_convertible 201806L <type_traits>
__cpp_lib_is_null_pointer 201309L <type_traits>
__cpp_lib_is_pointer_interconvertible 201907L <type_traits>
__cpp_lib_is_scoped_enum 202011L <type_traits>
__cpp_lib_is_sufficiently_aligned 202411L <memory>
__cpp_lib_is_swappable 201603L <type_traits>
__cpp_lib_is_virtual_base_of 202406L <type_traits>
__cpp_lib_is_within_lifetime 202306L <type_traits>
Expand Down Expand Up @@ -523,6 +525,7 @@ __cpp_lib_void_t 201411L <type_traits>
#endif

#if _LIBCPP_STD_VER >= 26
# define __cpp_lib_aligned_accessor 202411L
// # define __cpp_lib_associative_heterogeneous_insertion 202306L
// # define __cpp_lib_atomic_min_max 202403L
# undef __cpp_lib_bind_front
Expand Down Expand Up @@ -551,6 +554,7 @@ __cpp_lib_void_t 201411L <type_traits>
// # define __cpp_lib_generate_random 202403L
// # define __cpp_lib_hazard_pointer 202306L
// # define __cpp_lib_inplace_vector 202406L
# define __cpp_lib_is_sufficiently_aligned 202411L
# if __has_builtin(__builtin_is_virtual_base_of)
# define __cpp_lib_is_virtual_base_of 202406L
# endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// Test the feature test macros defined by <mdspan>

/* Constant Value
__cpp_lib_aligned_accessor 202411L [C++26]
__cpp_lib_freestanding_mdspan 202311L [C++26]
__cpp_lib_mdspan 202207L [C++23]
202406L [C++26]
Expand All @@ -27,6 +28,10 @@

#if TEST_STD_VER < 14

# ifdef __cpp_lib_aligned_accessor
# error "__cpp_lib_aligned_accessor should not be defined before c++26"
# endif

# ifdef __cpp_lib_freestanding_mdspan
# error "__cpp_lib_freestanding_mdspan should not be defined before c++26"
# endif
Expand All @@ -41,6 +46,10 @@

#elif TEST_STD_VER == 14

# ifdef __cpp_lib_aligned_accessor
# error "__cpp_lib_aligned_accessor should not be defined before c++26"
# endif

# ifdef __cpp_lib_freestanding_mdspan
# error "__cpp_lib_freestanding_mdspan should not be defined before c++26"
# endif
Expand All @@ -55,6 +64,10 @@

#elif TEST_STD_VER == 17

# ifdef __cpp_lib_aligned_accessor
# error "__cpp_lib_aligned_accessor should not be defined before c++26"
# endif

# ifdef __cpp_lib_freestanding_mdspan
# error "__cpp_lib_freestanding_mdspan should not be defined before c++26"
# endif
Expand All @@ -69,6 +82,10 @@

#elif TEST_STD_VER == 20

# ifdef __cpp_lib_aligned_accessor
# error "__cpp_lib_aligned_accessor should not be defined before c++26"
# endif

# ifdef __cpp_lib_freestanding_mdspan
# error "__cpp_lib_freestanding_mdspan should not be defined before c++26"
# endif
Expand All @@ -83,6 +100,10 @@

#elif TEST_STD_VER == 23

# ifdef __cpp_lib_aligned_accessor
# error "__cpp_lib_aligned_accessor should not be defined before c++26"
# endif

# ifdef __cpp_lib_freestanding_mdspan
# error "__cpp_lib_freestanding_mdspan should not be defined before c++26"
# endif
Expand All @@ -100,6 +121,13 @@

#elif TEST_STD_VER > 23

# ifndef __cpp_lib_aligned_accessor
# error "__cpp_lib_aligned_accessor should be defined in c++26"
# endif
# if __cpp_lib_aligned_accessor != 202411L
# error "__cpp_lib_aligned_accessor should have the value 202411L in c++26"
# endif

# if !defined(_LIBCPP_VERSION)
# ifndef __cpp_lib_freestanding_mdspan
# error "__cpp_lib_freestanding_mdspan should be defined in c++26"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
__cpp_lib_constexpr_memory 201811L [C++20]
202202L [C++23]
__cpp_lib_enable_shared_from_this 201603L [C++17]
__cpp_lib_is_sufficiently_aligned 202411L [C++26]
__cpp_lib_make_unique 201304L [C++14]
__cpp_lib_out_ptr 202106L [C++23]
202311L [C++26]
Expand Down Expand Up @@ -78,6 +79,10 @@
# error "__cpp_lib_enable_shared_from_this should not be defined before c++17"
# endif

# ifdef __cpp_lib_is_sufficiently_aligned
# error "__cpp_lib_is_sufficiently_aligned should not be defined before c++26"
# endif

# ifdef __cpp_lib_make_unique
# error "__cpp_lib_make_unique should not be defined before c++14"
# endif
Expand Down Expand Up @@ -152,6 +157,10 @@
# error "__cpp_lib_enable_shared_from_this should not be defined before c++17"
# endif

# ifdef __cpp_lib_is_sufficiently_aligned
# error "__cpp_lib_is_sufficiently_aligned should not be defined before c++26"
# endif

# ifndef __cpp_lib_make_unique
# error "__cpp_lib_make_unique should be defined in c++14"
# endif
Expand Down Expand Up @@ -241,6 +250,10 @@
# error "__cpp_lib_enable_shared_from_this should have the value 201603L in c++17"
# endif

# ifdef __cpp_lib_is_sufficiently_aligned
# error "__cpp_lib_is_sufficiently_aligned should not be defined before c++26"
# endif

# ifndef __cpp_lib_make_unique
# error "__cpp_lib_make_unique should be defined in c++17"
# endif
Expand Down Expand Up @@ -351,6 +364,10 @@
# error "__cpp_lib_enable_shared_from_this should have the value 201603L in c++20"
# endif

# ifdef __cpp_lib_is_sufficiently_aligned
# error "__cpp_lib_is_sufficiently_aligned should not be defined before c++26"
# endif

# ifndef __cpp_lib_make_unique
# error "__cpp_lib_make_unique should be defined in c++20"
# endif
Expand Down Expand Up @@ -473,6 +490,10 @@
# error "__cpp_lib_enable_shared_from_this should have the value 201603L in c++23"
# endif

# ifdef __cpp_lib_is_sufficiently_aligned
# error "__cpp_lib_is_sufficiently_aligned should not be defined before c++26"
# endif

# ifndef __cpp_lib_make_unique
# error "__cpp_lib_make_unique should be defined in c++23"
# endif
Expand Down Expand Up @@ -598,6 +619,13 @@
# error "__cpp_lib_enable_shared_from_this should have the value 201603L in c++26"
# endif

# ifndef __cpp_lib_is_sufficiently_aligned
# error "__cpp_lib_is_sufficiently_aligned should be defined in c++26"
# endif
# if __cpp_lib_is_sufficiently_aligned != 202411L
# error "__cpp_lib_is_sufficiently_aligned should have the value 202411L in c++26"
# endif

# ifndef __cpp_lib_make_unique
# error "__cpp_lib_make_unique should be defined in c++26"
# endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
/* Constant Value
__cpp_lib_adaptor_iterator_pair_constructor 202106L [C++23]
__cpp_lib_addressof_constexpr 201603L [C++17]
__cpp_lib_aligned_accessor 202411L [C++26]
__cpp_lib_allocate_at_least 202302L [C++23]
__cpp_lib_allocator_traits_is_always_equal 201411L [C++17]
__cpp_lib_any 201606L [C++17]
Expand Down Expand Up @@ -132,6 +133,7 @@
__cpp_lib_is_null_pointer 201309L [C++14]
__cpp_lib_is_pointer_interconvertible 201907L [C++20]
__cpp_lib_is_scoped_enum 202011L [C++23]
__cpp_lib_is_sufficiently_aligned 202411L [C++26]
__cpp_lib_is_swappable 201603L [C++17]
__cpp_lib_is_virtual_base_of 202406L [C++26]
__cpp_lib_is_within_lifetime 202306L [C++26]
Expand Down Expand Up @@ -264,6 +266,10 @@
# error "__cpp_lib_addressof_constexpr should not be defined before c++17"
# endif

# ifdef __cpp_lib_aligned_accessor
# error "__cpp_lib_aligned_accessor should not be defined before c++26"
# endif

# ifdef __cpp_lib_allocate_at_least
# error "__cpp_lib_allocate_at_least should not be defined before c++23"
# endif
Expand Down Expand Up @@ -704,6 +710,10 @@
# error "__cpp_lib_is_scoped_enum should not be defined before c++23"
# endif

# ifdef __cpp_lib_is_sufficiently_aligned
# error "__cpp_lib_is_sufficiently_aligned should not be defined before c++26"
# endif

# ifdef __cpp_lib_is_swappable
# error "__cpp_lib_is_swappable should not be defined before c++17"
# endif
Expand Down Expand Up @@ -1126,6 +1136,10 @@
# error "__cpp_lib_addressof_constexpr should not be defined before c++17"
# endif

# ifdef __cpp_lib_aligned_accessor
# error "__cpp_lib_aligned_accessor should not be defined before c++26"
# endif

# ifdef __cpp_lib_allocate_at_least
# error "__cpp_lib_allocate_at_least should not be defined before c++23"
# endif
Expand Down Expand Up @@ -1590,6 +1604,10 @@
# error "__cpp_lib_is_scoped_enum should not be defined before c++23"
# endif

# ifdef __cpp_lib_is_sufficiently_aligned
# error "__cpp_lib_is_sufficiently_aligned should not be defined before c++26"
# endif

# ifdef __cpp_lib_is_swappable
# error "__cpp_lib_is_swappable should not be defined before c++17"
# endif
Expand Down Expand Up @@ -2063,6 +2081,10 @@
# error "__cpp_lib_addressof_constexpr should have the value 201603L in c++17"
# endif

# ifdef __cpp_lib_aligned_accessor
# error "__cpp_lib_aligned_accessor should not be defined before c++26"
# endif

# ifdef __cpp_lib_allocate_at_least
# error "__cpp_lib_allocate_at_least should not be defined before c++23"
# endif
Expand Down Expand Up @@ -2611,6 +2633,10 @@
# error "__cpp_lib_is_scoped_enum should not be defined before c++23"
# endif

# ifdef __cpp_lib_is_sufficiently_aligned
# error "__cpp_lib_is_sufficiently_aligned should not be defined before c++26"
# endif

# ifndef __cpp_lib_is_swappable
# error "__cpp_lib_is_swappable should be defined in c++17"
# endif
Expand Down Expand Up @@ -3195,6 +3221,10 @@
# error "__cpp_lib_addressof_constexpr should have the value 201603L in c++20"
# endif

# ifdef __cpp_lib_aligned_accessor
# error "__cpp_lib_aligned_accessor should not be defined before c++26"
# endif

# ifdef __cpp_lib_allocate_at_least
# error "__cpp_lib_allocate_at_least should not be defined before c++23"
# endif
Expand Down Expand Up @@ -3914,6 +3944,10 @@
# error "__cpp_lib_is_scoped_enum should not be defined before c++23"
# endif

# ifdef __cpp_lib_is_sufficiently_aligned
# error "__cpp_lib_is_sufficiently_aligned should not be defined before c++26"
# endif

# ifndef __cpp_lib_is_swappable
# error "__cpp_lib_is_swappable should be defined in c++20"
# endif
Expand Down Expand Up @@ -4594,6 +4628,10 @@
# error "__cpp_lib_addressof_constexpr should have the value 201603L in c++23"
# endif

# ifdef __cpp_lib_aligned_accessor
# error "__cpp_lib_aligned_accessor should not be defined before c++26"
# endif

# ifndef __cpp_lib_allocate_at_least
# error "__cpp_lib_allocate_at_least should be defined in c++23"
# endif
Expand Down Expand Up @@ -5388,6 +5426,10 @@
# error "__cpp_lib_is_scoped_enum should have the value 202011L in c++23"
# endif

# ifdef __cpp_lib_is_sufficiently_aligned
# error "__cpp_lib_is_sufficiently_aligned should not be defined before c++26"
# endif

# ifndef __cpp_lib_is_swappable
# error "__cpp_lib_is_swappable should be defined in c++23"
# endif
Expand Down Expand Up @@ -6215,6 +6257,13 @@
# error "__cpp_lib_addressof_constexpr should have the value 201603L in c++26"
# endif

# ifndef __cpp_lib_aligned_accessor
# error "__cpp_lib_aligned_accessor should be defined in c++26"
# endif
# if __cpp_lib_aligned_accessor != 202411L
# error "__cpp_lib_aligned_accessor should have the value 202411L in c++26"
# endif

# ifndef __cpp_lib_allocate_at_least
# error "__cpp_lib_allocate_at_least should be defined in c++26"
# endif
Expand Down Expand Up @@ -7201,6 +7250,13 @@
# error "__cpp_lib_is_scoped_enum should have the value 202011L in c++26"
# endif

# ifndef __cpp_lib_is_sufficiently_aligned
# error "__cpp_lib_is_sufficiently_aligned should be defined in c++26"
# endif
# if __cpp_lib_is_sufficiently_aligned != 202411L
# error "__cpp_lib_is_sufficiently_aligned should have the value 202411L in c++26"
# endif

# ifndef __cpp_lib_is_swappable
# error "__cpp_lib_is_swappable should be defined in c++26"
# endif
Expand Down
10 changes: 10 additions & 0 deletions libcxx/utils/generate_feature_test_macro_components.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ def add_version_header(tc):
"values": {"c++17": 201603},
"headers": ["memory"],
},
{
"name": "__cpp_lib_aligned_accessor",
"values": {"c++26": 202411},
"headers": ["mdspan"],
},
{
"name": "__cpp_lib_allocate_at_least",
"values": {
Expand Down Expand Up @@ -781,6 +786,11 @@ def add_version_header(tc):
"values": {"c++23": 202011},
"headers": ["type_traits"],
},
{
"name": "__cpp_lib_is_sufficiently_aligned",
"values": {"c++26": 202411},
"headers": ["memory"],
},
{
"name": "__cpp_lib_is_swappable",
"values": {"c++17": 201603},
Expand Down

0 comments on commit e36bc1c

Please sign in to comment.