Make the #endif comment match the #if condition in the generated code.
Also adjust a comment in the Scheme code which describes the logic. The
__glibcxx_name macro is not defined _unconditionally_, as it still
depends on the conditions in cxxmin, extra_cond etc.
libstdc++-v3/ChangeLog:
* include/bits/version.tpl: Fix comment on #endif. Tweak
description of when macros are defined.
* include/bits/version.h: Regenerate.
---
Tested x86_64-linux.
libstdc++-v3/include/bits/version.h | 444 +++++++++++++-------------
libstdc++-v3/include/bits/version.tpl | 6 +-
2 files changed, 225 insertions(+), 225 deletions(-)
diff --git a/libstdc++-v3/include/bits/version.h
b/libstdc++-v3/include/bits/version.h
index 044d756de196..69f6b4eecf3c 100644
--- a/libstdc++-v3/include/bits/version.h
+++ b/libstdc++-v3/include/bits/version.h
@@ -57,7 +57,7 @@
# define __cpp_lib_incomplete_container_elements 201505L
# endif
# endif
-#endif /* !defined(__cpp_lib_incomplete_container_elements) &&
defined(__glibcxx_want_incomplete_container_elements) */
+#endif /* !defined(__cpp_lib_incomplete_container_elements) */
#undef __glibcxx_want_incomplete_container_elements
#if !defined(__cpp_lib_uncaught_exceptions)
@@ -67,7 +67,7 @@
# define __cpp_lib_uncaught_exceptions 201411L
# endif
# endif
-#endif /* !defined(__cpp_lib_uncaught_exceptions) &&
defined(__glibcxx_want_uncaught_exceptions) */
+#endif /* !defined(__cpp_lib_uncaught_exceptions) */
#undef __glibcxx_want_uncaught_exceptions
#if !defined(__cpp_lib_allocator_traits_is_always_equal)
@@ -77,7 +77,7 @@
# define __cpp_lib_allocator_traits_is_always_equal 201411L
# endif
# endif
-#endif /* !defined(__cpp_lib_allocator_traits_is_always_equal) &&
defined(__glibcxx_want_allocator_traits_is_always_equal) */
+#endif /* !defined(__cpp_lib_allocator_traits_is_always_equal) */
#undef __glibcxx_want_allocator_traits_is_always_equal
#if !defined(__cpp_lib_is_null_pointer)
@@ -87,7 +87,7 @@
# define __cpp_lib_is_null_pointer 201309L
# endif
# endif
-#endif /* !defined(__cpp_lib_is_null_pointer) &&
defined(__glibcxx_want_is_null_pointer) */
+#endif /* !defined(__cpp_lib_is_null_pointer) */
#undef __glibcxx_want_is_null_pointer
#if !defined(__cpp_lib_result_of_sfinae)
@@ -97,7 +97,7 @@
# define __cpp_lib_result_of_sfinae 201210L
# endif
# endif
-#endif /* !defined(__cpp_lib_result_of_sfinae) &&
defined(__glibcxx_want_result_of_sfinae) */
+#endif /* !defined(__cpp_lib_result_of_sfinae) */
#undef __glibcxx_want_result_of_sfinae
#if !defined(__cpp_lib_shared_ptr_arrays)
@@ -112,7 +112,7 @@
# define __cpp_lib_shared_ptr_arrays 201611L
# endif
# endif
-#endif /* !defined(__cpp_lib_shared_ptr_arrays) &&
defined(__glibcxx_want_shared_ptr_arrays) */
+#endif /* !defined(__cpp_lib_shared_ptr_arrays) */
#undef __glibcxx_want_shared_ptr_arrays
#if !defined(__cpp_lib_is_swappable)
@@ -122,7 +122,7 @@
# define __cpp_lib_is_swappable 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_is_swappable) &&
defined(__glibcxx_want_is_swappable) */
+#endif /* !defined(__cpp_lib_is_swappable) */
#undef __glibcxx_want_is_swappable
#if !defined(__cpp_lib_void_t)
@@ -132,7 +132,7 @@
# define __cpp_lib_void_t 201411L
# endif
# endif
-#endif /* !defined(__cpp_lib_void_t) && defined(__glibcxx_want_void_t) */
+#endif /* !defined(__cpp_lib_void_t) */
#undef __glibcxx_want_void_t
#if !defined(__cpp_lib_enable_shared_from_this)
@@ -142,7 +142,7 @@
# define __cpp_lib_enable_shared_from_this 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_enable_shared_from_this) &&
defined(__glibcxx_want_enable_shared_from_this) */
+#endif /* !defined(__cpp_lib_enable_shared_from_this) */
#undef __glibcxx_want_enable_shared_from_this
#if !defined(__cpp_lib_math_spec_funcs)
@@ -152,7 +152,7 @@
# define __STDCPP_MATH_SPEC_FUNCS__ 201003L
# endif
# endif
-#endif /* !defined(__cpp_lib_math_spec_funcs) &&
defined(__glibcxx_want_math_spec_funcs) */
+#endif /* !defined(__cpp_lib_math_spec_funcs) */
#undef __glibcxx_want_math_spec_funcs
#if !defined(__cpp_lib_coroutine)
@@ -162,7 +162,7 @@
# define __cpp_lib_coroutine 201902L
# endif
# endif
-#endif /* !defined(__cpp_lib_coroutine) && defined(__glibcxx_want_coroutine) */
+#endif /* !defined(__cpp_lib_coroutine) */
#undef __glibcxx_want_coroutine
#if !defined(__cpp_lib_exchange_function)
@@ -172,7 +172,7 @@
# define __cpp_lib_exchange_function 201304L
# endif
# endif
-#endif /* !defined(__cpp_lib_exchange_function) &&
defined(__glibcxx_want_exchange_function) */
+#endif /* !defined(__cpp_lib_exchange_function) */
#undef __glibcxx_want_exchange_function
#if !defined(__cpp_lib_integer_sequence)
@@ -182,7 +182,7 @@
# define __cpp_lib_integer_sequence 201304L
# endif
# endif
-#endif /* !defined(__cpp_lib_integer_sequence) &&
defined(__glibcxx_want_integer_sequence) */
+#endif /* !defined(__cpp_lib_integer_sequence) */
#undef __glibcxx_want_integer_sequence
#if !defined(__cpp_lib_integral_constant_callable)
@@ -192,7 +192,7 @@
# define __cpp_lib_integral_constant_callable 201304L
# endif
# endif
-#endif /* !defined(__cpp_lib_integral_constant_callable) &&
defined(__glibcxx_want_integral_constant_callable) */
+#endif /* !defined(__cpp_lib_integral_constant_callable) */
#undef __glibcxx_want_integral_constant_callable
#if !defined(__cpp_lib_is_final)
@@ -202,7 +202,7 @@
# define __cpp_lib_is_final 201402L
# endif
# endif
-#endif /* !defined(__cpp_lib_is_final) && defined(__glibcxx_want_is_final) */
+#endif /* !defined(__cpp_lib_is_final) */
#undef __glibcxx_want_is_final
#if !defined(__cpp_lib_make_reverse_iterator)
@@ -212,7 +212,7 @@
# define __cpp_lib_make_reverse_iterator 201402L
# endif
# endif
-#endif /* !defined(__cpp_lib_make_reverse_iterator) &&
defined(__glibcxx_want_make_reverse_iterator) */
+#endif /* !defined(__cpp_lib_make_reverse_iterator) */
#undef __glibcxx_want_make_reverse_iterator
#if !defined(__cpp_lib_null_iterators)
@@ -222,7 +222,7 @@
# define __cpp_lib_null_iterators 201304L
# endif
# endif
-#endif /* !defined(__cpp_lib_null_iterators) &&
defined(__glibcxx_want_null_iterators) */
+#endif /* !defined(__cpp_lib_null_iterators) */
#undef __glibcxx_want_null_iterators
#if !defined(__cpp_lib_transformation_trait_aliases)
@@ -232,7 +232,7 @@
# define __cpp_lib_transformation_trait_aliases 201304L
# endif
# endif
-#endif /* !defined(__cpp_lib_transformation_trait_aliases) &&
defined(__glibcxx_want_transformation_trait_aliases) */
+#endif /* !defined(__cpp_lib_transformation_trait_aliases) */
#undef __glibcxx_want_transformation_trait_aliases
#if !defined(__cpp_lib_transparent_operators)
@@ -242,7 +242,7 @@
# define __cpp_lib_transparent_operators 201510L
# endif
# endif
-#endif /* !defined(__cpp_lib_transparent_operators) &&
defined(__glibcxx_want_transparent_operators) */
+#endif /* !defined(__cpp_lib_transparent_operators) */
#undef __glibcxx_want_transparent_operators
#if !defined(__cpp_lib_tuple_element_t)
@@ -252,7 +252,7 @@
# define __cpp_lib_tuple_element_t 201402L
# endif
# endif
-#endif /* !defined(__cpp_lib_tuple_element_t) &&
defined(__glibcxx_want_tuple_element_t) */
+#endif /* !defined(__cpp_lib_tuple_element_t) */
#undef __glibcxx_want_tuple_element_t
#if !defined(__cpp_lib_tuples_by_type)
@@ -262,7 +262,7 @@
# define __cpp_lib_tuples_by_type 201304L
# endif
# endif
-#endif /* !defined(__cpp_lib_tuples_by_type) &&
defined(__glibcxx_want_tuples_by_type) */
+#endif /* !defined(__cpp_lib_tuples_by_type) */
#undef __glibcxx_want_tuples_by_type
#if !defined(__cpp_lib_robust_nonmodifying_seq_ops)
@@ -272,7 +272,7 @@
# define __cpp_lib_robust_nonmodifying_seq_ops 201304L
# endif
# endif
-#endif /* !defined(__cpp_lib_robust_nonmodifying_seq_ops) &&
defined(__glibcxx_want_robust_nonmodifying_seq_ops) */
+#endif /* !defined(__cpp_lib_robust_nonmodifying_seq_ops) */
#undef __glibcxx_want_robust_nonmodifying_seq_ops
#if !defined(__cpp_lib_to_chars)
@@ -287,7 +287,7 @@
# define __cpp_lib_to_chars 201611L
# endif
# endif
-#endif /* !defined(__cpp_lib_to_chars) && defined(__glibcxx_want_to_chars) */
+#endif /* !defined(__cpp_lib_to_chars) */
#undef __glibcxx_want_to_chars
#if !defined(__cpp_lib_chrono_udls)
@@ -297,7 +297,7 @@
# define __cpp_lib_chrono_udls 201304L
# endif
# endif
-#endif /* !defined(__cpp_lib_chrono_udls) &&
defined(__glibcxx_want_chrono_udls) */
+#endif /* !defined(__cpp_lib_chrono_udls) */
#undef __glibcxx_want_chrono_udls
#if !defined(__cpp_lib_complex_udls)
@@ -307,7 +307,7 @@
# define __cpp_lib_complex_udls 201309L
# endif
# endif
-#endif /* !defined(__cpp_lib_complex_udls) &&
defined(__glibcxx_want_complex_udls) */
+#endif /* !defined(__cpp_lib_complex_udls) */
#undef __glibcxx_want_complex_udls
#if !defined(__cpp_lib_generic_associative_lookup)
@@ -317,7 +317,7 @@
# define __cpp_lib_generic_associative_lookup 201304L
# endif
# endif
-#endif /* !defined(__cpp_lib_generic_associative_lookup) &&
defined(__glibcxx_want_generic_associative_lookup) */
+#endif /* !defined(__cpp_lib_generic_associative_lookup) */
#undef __glibcxx_want_generic_associative_lookup
#if !defined(__cpp_lib_make_unique)
@@ -327,7 +327,7 @@
# define __cpp_lib_make_unique 201304L
# endif
# endif
-#endif /* !defined(__cpp_lib_make_unique) &&
defined(__glibcxx_want_make_unique) */
+#endif /* !defined(__cpp_lib_make_unique) */
#undef __glibcxx_want_make_unique
#if !defined(__cpp_lib_quoted_string_io)
@@ -337,7 +337,7 @@
# define __cpp_lib_quoted_string_io 201304L
# endif
# endif
-#endif /* !defined(__cpp_lib_quoted_string_io) &&
defined(__glibcxx_want_quoted_string_io) */
+#endif /* !defined(__cpp_lib_quoted_string_io) */
#undef __glibcxx_want_quoted_string_io
#if !defined(__cpp_lib_shared_timed_mutex)
@@ -347,7 +347,7 @@
# define __cpp_lib_shared_timed_mutex 201402L
# endif
# endif
-#endif /* !defined(__cpp_lib_shared_timed_mutex) &&
defined(__glibcxx_want_shared_timed_mutex) */
+#endif /* !defined(__cpp_lib_shared_timed_mutex) */
#undef __glibcxx_want_shared_timed_mutex
#if !defined(__cpp_lib_string_udls)
@@ -357,7 +357,7 @@
# define __cpp_lib_string_udls 201304L
# endif
# endif
-#endif /* !defined(__cpp_lib_string_udls) &&
defined(__glibcxx_want_string_udls) */
+#endif /* !defined(__cpp_lib_string_udls) */
#undef __glibcxx_want_string_udls
#if !defined(__cpp_lib_addressof_constexpr)
@@ -367,7 +367,7 @@
# define __cpp_lib_addressof_constexpr 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_addressof_constexpr) &&
defined(__glibcxx_want_addressof_constexpr) */
+#endif /* !defined(__cpp_lib_addressof_constexpr) */
#undef __glibcxx_want_addressof_constexpr
#if !defined(__cpp_lib_any)
@@ -377,7 +377,7 @@
# define __cpp_lib_any 201606L
# endif
# endif
-#endif /* !defined(__cpp_lib_any) && defined(__glibcxx_want_any) */
+#endif /* !defined(__cpp_lib_any) */
#undef __glibcxx_want_any
#if !defined(__cpp_lib_apply)
@@ -387,7 +387,7 @@
# define __cpp_lib_apply 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_apply) && defined(__glibcxx_want_apply) */
+#endif /* !defined(__cpp_lib_apply) */
#undef __glibcxx_want_apply
#if !defined(__cpp_lib_as_const)
@@ -397,7 +397,7 @@
# define __cpp_lib_as_const 201510L
# endif
# endif
-#endif /* !defined(__cpp_lib_as_const) && defined(__glibcxx_want_as_const) */
+#endif /* !defined(__cpp_lib_as_const) */
#undef __glibcxx_want_as_const
#if !defined(__cpp_lib_atomic_is_always_lock_free)
@@ -407,7 +407,7 @@
# define __cpp_lib_atomic_is_always_lock_free 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_atomic_is_always_lock_free) &&
defined(__glibcxx_want_atomic_is_always_lock_free) */
+#endif /* !defined(__cpp_lib_atomic_is_always_lock_free) */
#undef __glibcxx_want_atomic_is_always_lock_free
#if !defined(__cpp_lib_bool_constant)
@@ -417,7 +417,7 @@
# define __cpp_lib_bool_constant 201505L
# endif
# endif
-#endif /* !defined(__cpp_lib_bool_constant) &&
defined(__glibcxx_want_bool_constant) */
+#endif /* !defined(__cpp_lib_bool_constant) */
#undef __glibcxx_want_bool_constant
#if !defined(__cpp_lib_byte)
@@ -427,7 +427,7 @@
# define __cpp_lib_byte 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_byte) && defined(__glibcxx_want_byte) */
+#endif /* !defined(__cpp_lib_byte) */
#undef __glibcxx_want_byte
#if !defined(__cpp_lib_constant_wrapper)
@@ -437,7 +437,7 @@
# define __cpp_lib_constant_wrapper 202506L
# endif
# endif
-#endif /* !defined(__cpp_lib_constant_wrapper) &&
defined(__glibcxx_want_constant_wrapper) */
+#endif /* !defined(__cpp_lib_constant_wrapper) */
#undef __glibcxx_want_constant_wrapper
#if !defined(__cpp_lib_has_unique_object_representations)
@@ -447,7 +447,7 @@
# define __cpp_lib_has_unique_object_representations 201606L
# endif
# endif
-#endif /* !defined(__cpp_lib_has_unique_object_representations) &&
defined(__glibcxx_want_has_unique_object_representations) */
+#endif /* !defined(__cpp_lib_has_unique_object_representations) */
#undef __glibcxx_want_has_unique_object_representations
#if !defined(__cpp_lib_hardware_interference_size)
@@ -457,7 +457,7 @@
# define __cpp_lib_hardware_interference_size 201703L
# endif
# endif
-#endif /* !defined(__cpp_lib_hardware_interference_size) &&
defined(__glibcxx_want_hardware_interference_size) */
+#endif /* !defined(__cpp_lib_hardware_interference_size) */
#undef __glibcxx_want_hardware_interference_size
#if !defined(__cpp_lib_invoke)
@@ -467,7 +467,7 @@
# define __cpp_lib_invoke 201411L
# endif
# endif
-#endif /* !defined(__cpp_lib_invoke) && defined(__glibcxx_want_invoke) */
+#endif /* !defined(__cpp_lib_invoke) */
#undef __glibcxx_want_invoke
#if !defined(__cpp_lib_is_aggregate)
@@ -477,7 +477,7 @@
# define __cpp_lib_is_aggregate 201703L
# endif
# endif
-#endif /* !defined(__cpp_lib_is_aggregate) &&
defined(__glibcxx_want_is_aggregate) */
+#endif /* !defined(__cpp_lib_is_aggregate) */
#undef __glibcxx_want_is_aggregate
#if !defined(__cpp_lib_is_invocable)
@@ -487,7 +487,7 @@
# define __cpp_lib_is_invocable 201703L
# endif
# endif
-#endif /* !defined(__cpp_lib_is_invocable) &&
defined(__glibcxx_want_is_invocable) */
+#endif /* !defined(__cpp_lib_is_invocable) */
#undef __glibcxx_want_is_invocable
#if !defined(__cpp_lib_launder)
@@ -497,7 +497,7 @@
# define __cpp_lib_launder 201606L
# endif
# endif
-#endif /* !defined(__cpp_lib_launder) && defined(__glibcxx_want_launder) */
+#endif /* !defined(__cpp_lib_launder) */
#undef __glibcxx_want_launder
#if !defined(__cpp_lib_logical_traits)
@@ -507,7 +507,7 @@
# define __cpp_lib_logical_traits 201510L
# endif
# endif
-#endif /* !defined(__cpp_lib_logical_traits) &&
defined(__glibcxx_want_logical_traits) */
+#endif /* !defined(__cpp_lib_logical_traits) */
#undef __glibcxx_want_logical_traits
#if !defined(__cpp_lib_make_from_tuple)
@@ -517,7 +517,7 @@
# define __cpp_lib_make_from_tuple 201606L
# endif
# endif
-#endif /* !defined(__cpp_lib_make_from_tuple) &&
defined(__glibcxx_want_make_from_tuple) */
+#endif /* !defined(__cpp_lib_make_from_tuple) */
#undef __glibcxx_want_make_from_tuple
#if !defined(__cpp_lib_not_fn)
@@ -532,7 +532,7 @@
# define __cpp_lib_not_fn 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_not_fn) && defined(__glibcxx_want_not_fn) */
+#endif /* !defined(__cpp_lib_not_fn) */
#undef __glibcxx_want_not_fn
#if !defined(__cpp_lib_type_trait_variable_templates)
@@ -542,7 +542,7 @@
# define __cpp_lib_type_trait_variable_templates 201510L
# endif
# endif
-#endif /* !defined(__cpp_lib_type_trait_variable_templates) &&
defined(__glibcxx_want_type_trait_variable_templates) */
+#endif /* !defined(__cpp_lib_type_trait_variable_templates) */
#undef __glibcxx_want_type_trait_variable_templates
#if !defined(__cpp_lib_variant)
@@ -562,7 +562,7 @@
# define __cpp_lib_variant 202102L
# endif
# endif
-#endif /* !defined(__cpp_lib_variant) && defined(__glibcxx_want_variant) */
+#endif /* !defined(__cpp_lib_variant) */
#undef __glibcxx_want_variant
#if !defined(__cpp_lib_lcm)
@@ -572,7 +572,7 @@
# define __cpp_lib_lcm 201606L
# endif
# endif
-#endif /* !defined(__cpp_lib_lcm) && defined(__glibcxx_want_lcm) */
+#endif /* !defined(__cpp_lib_lcm) */
#undef __glibcxx_want_lcm
#if !defined(__cpp_lib_gcd)
@@ -582,7 +582,7 @@
# define __cpp_lib_gcd 201606L
# endif
# endif
-#endif /* !defined(__cpp_lib_gcd) && defined(__glibcxx_want_gcd) */
+#endif /* !defined(__cpp_lib_gcd) */
#undef __glibcxx_want_gcd
#if !defined(__cpp_lib_gcd_lcm)
@@ -592,7 +592,7 @@
# define __cpp_lib_gcd_lcm 201606L
# endif
# endif
-#endif /* !defined(__cpp_lib_gcd_lcm) && defined(__glibcxx_want_gcd_lcm) */
+#endif /* !defined(__cpp_lib_gcd_lcm) */
#undef __glibcxx_want_gcd_lcm
#if !defined(__cpp_lib_raw_memory_algorithms)
@@ -607,7 +607,7 @@
# define __cpp_lib_raw_memory_algorithms 201606L
# endif
# endif
-#endif /* !defined(__cpp_lib_raw_memory_algorithms) &&
defined(__glibcxx_want_raw_memory_algorithms) */
+#endif /* !defined(__cpp_lib_raw_memory_algorithms) */
#undef __glibcxx_want_raw_memory_algorithms
#if !defined(__cpp_lib_array_constexpr)
@@ -622,7 +622,7 @@
# define __cpp_lib_array_constexpr 201803L
# endif
# endif
-#endif /* !defined(__cpp_lib_array_constexpr) &&
defined(__glibcxx_want_array_constexpr) */
+#endif /* !defined(__cpp_lib_array_constexpr) */
#undef __glibcxx_want_array_constexpr
#if !defined(__cpp_lib_nonmember_container_access)
@@ -632,7 +632,7 @@
# define __cpp_lib_nonmember_container_access 201411L
# endif
# endif
-#endif /* !defined(__cpp_lib_nonmember_container_access) &&
defined(__glibcxx_want_nonmember_container_access) */
+#endif /* !defined(__cpp_lib_nonmember_container_access) */
#undef __glibcxx_want_nonmember_container_access
#if !defined(__cpp_lib_clamp)
@@ -642,7 +642,7 @@
# define __cpp_lib_clamp 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_clamp) && defined(__glibcxx_want_clamp) */
+#endif /* !defined(__cpp_lib_clamp) */
#undef __glibcxx_want_clamp
#if !defined(__cpp_lib_sample)
@@ -652,7 +652,7 @@
# define __cpp_lib_sample 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_sample) && defined(__glibcxx_want_sample) */
+#endif /* !defined(__cpp_lib_sample) */
#undef __glibcxx_want_sample
#if !defined(__cpp_lib_boyer_moore_searcher)
@@ -662,7 +662,7 @@
# define __cpp_lib_boyer_moore_searcher 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_boyer_moore_searcher) &&
defined(__glibcxx_want_boyer_moore_searcher) */
+#endif /* !defined(__cpp_lib_boyer_moore_searcher) */
#undef __glibcxx_want_boyer_moore_searcher
#if !defined(__cpp_lib_chrono)
@@ -677,7 +677,7 @@
# define __cpp_lib_chrono 201611L
# endif
# endif
-#endif /* !defined(__cpp_lib_chrono) && defined(__glibcxx_want_chrono) */
+#endif /* !defined(__cpp_lib_chrono) */
#undef __glibcxx_want_chrono
#if !defined(__cpp_lib_chrono_cxx20)
@@ -686,7 +686,7 @@
# if defined(__glibcxx_want_all) || defined(__glibcxx_want_chrono_cxx20)
# endif
# endif
-#endif /* !defined(__cpp_lib_chrono_cxx20) &&
defined(__glibcxx_want_chrono_cxx20) */
+#endif /* !defined(__cpp_lib_chrono_cxx20) */
#undef __glibcxx_want_chrono_cxx20
#if !defined(__cpp_lib_execution)
@@ -696,7 +696,7 @@
# define __cpp_lib_execution 201902L
# endif
# endif
-#endif /* !defined(__cpp_lib_execution) && defined(__glibcxx_want_execution) */
+#endif /* !defined(__cpp_lib_execution) */
#undef __glibcxx_want_execution
#if !defined(__cpp_lib_filesystem)
@@ -706,7 +706,7 @@
# define __cpp_lib_filesystem 201703L
# endif
# endif
-#endif /* !defined(__cpp_lib_filesystem) && defined(__glibcxx_want_filesystem)
*/
+#endif /* !defined(__cpp_lib_filesystem) */
#undef __glibcxx_want_filesystem
#if !defined(__cpp_lib_hypot)
@@ -716,7 +716,7 @@
# define __cpp_lib_hypot 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_hypot) && defined(__glibcxx_want_hypot) */
+#endif /* !defined(__cpp_lib_hypot) */
#undef __glibcxx_want_hypot
#if !defined(__cpp_lib_map_try_emplace)
@@ -726,7 +726,7 @@
# define __cpp_lib_map_try_emplace 201411L
# endif
# endif
-#endif /* !defined(__cpp_lib_map_try_emplace) &&
defined(__glibcxx_want_map_try_emplace) */
+#endif /* !defined(__cpp_lib_map_try_emplace) */
#undef __glibcxx_want_map_try_emplace
#if !defined(__cpp_lib_math_special_functions)
@@ -736,7 +736,7 @@
# define __cpp_lib_math_special_functions 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_math_special_functions) &&
defined(__glibcxx_want_math_special_functions) */
+#endif /* !defined(__cpp_lib_math_special_functions) */
#undef __glibcxx_want_math_special_functions
#if !defined(__cpp_lib_memory_resource)
@@ -751,7 +751,7 @@
# define __cpp_lib_memory_resource 1L
# endif
# endif
-#endif /* !defined(__cpp_lib_memory_resource) &&
defined(__glibcxx_want_memory_resource) */
+#endif /* !defined(__cpp_lib_memory_resource) */
#undef __glibcxx_want_memory_resource
#if !defined(__cpp_lib_node_extract)
@@ -761,7 +761,7 @@
# define __cpp_lib_node_extract 201606L
# endif
# endif
-#endif /* !defined(__cpp_lib_node_extract) &&
defined(__glibcxx_want_node_extract) */
+#endif /* !defined(__cpp_lib_node_extract) */
#undef __glibcxx_want_node_extract
#if !defined(__cpp_lib_parallel_algorithm)
@@ -771,7 +771,7 @@
# define __cpp_lib_parallel_algorithm 201603L
# endif
# endif
-#endif /* !defined(__cpp_lib_parallel_algorithm) &&
defined(__glibcxx_want_parallel_algorithm) */
+#endif /* !defined(__cpp_lib_parallel_algorithm) */
#undef __glibcxx_want_parallel_algorithm
#if !defined(__cpp_lib_scoped_lock)
@@ -781,7 +781,7 @@
# define __cpp_lib_scoped_lock 201703L
# endif
# endif
-#endif /* !defined(__cpp_lib_scoped_lock) &&
defined(__glibcxx_want_scoped_lock) */
+#endif /* !defined(__cpp_lib_scoped_lock) */
#undef __glibcxx_want_scoped_lock
#if !defined(__cpp_lib_shared_mutex)
@@ -791,7 +791,7 @@
# define __cpp_lib_shared_mutex 201505L
# endif
# endif
-#endif /* !defined(__cpp_lib_shared_mutex) &&
defined(__glibcxx_want_shared_mutex) */
+#endif /* !defined(__cpp_lib_shared_mutex) */
#undef __glibcxx_want_shared_mutex
#if !defined(__cpp_lib_shared_ptr_weak_type)
@@ -801,7 +801,7 @@
# define __cpp_lib_shared_ptr_weak_type 201606L
# endif
# endif
-#endif /* !defined(__cpp_lib_shared_ptr_weak_type) &&
defined(__glibcxx_want_shared_ptr_weak_type) */
+#endif /* !defined(__cpp_lib_shared_ptr_weak_type) */
#undef __glibcxx_want_shared_ptr_weak_type
#if !defined(__cpp_lib_string_view)
@@ -816,7 +816,7 @@
# define __cpp_lib_string_view 201803L
# endif
# endif
-#endif /* !defined(__cpp_lib_string_view) &&
defined(__glibcxx_want_string_view) */
+#endif /* !defined(__cpp_lib_string_view) */
#undef __glibcxx_want_string_view
#if !defined(__cpp_lib_unordered_map_try_emplace)
@@ -826,7 +826,7 @@
# define __cpp_lib_unordered_map_try_emplace 201411L
# endif
# endif
-#endif /* !defined(__cpp_lib_unordered_map_try_emplace) &&
defined(__glibcxx_want_unordered_map_try_emplace) */
+#endif /* !defined(__cpp_lib_unordered_map_try_emplace) */
#undef __glibcxx_want_unordered_map_try_emplace
#if !defined(__cpp_lib_assume_aligned)
@@ -836,7 +836,7 @@
# define __cpp_lib_assume_aligned 201811L
# endif
# endif
-#endif /* !defined(__cpp_lib_assume_aligned) &&
defined(__glibcxx_want_assume_aligned) */
+#endif /* !defined(__cpp_lib_assume_aligned) */
#undef __glibcxx_want_assume_aligned
#if !defined(__cpp_lib_is_sufficiently_aligned)
@@ -846,7 +846,7 @@
# define __cpp_lib_is_sufficiently_aligned 202411L
# endif
# endif
-#endif /* !defined(__cpp_lib_is_sufficiently_aligned) &&
defined(__glibcxx_want_is_sufficiently_aligned) */
+#endif /* !defined(__cpp_lib_is_sufficiently_aligned) */
#undef __glibcxx_want_is_sufficiently_aligned
#if !defined(__cpp_lib_atomic_flag_test)
@@ -856,7 +856,7 @@
# define __cpp_lib_atomic_flag_test 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_atomic_flag_test) &&
defined(__glibcxx_want_atomic_flag_test) */
+#endif /* !defined(__cpp_lib_atomic_flag_test) */
#undef __glibcxx_want_atomic_flag_test
#if !defined(__cpp_lib_atomic_float)
@@ -866,7 +866,7 @@
# define __cpp_lib_atomic_float 201711L
# endif
# endif
-#endif /* !defined(__cpp_lib_atomic_float) &&
defined(__glibcxx_want_atomic_float) */
+#endif /* !defined(__cpp_lib_atomic_float) */
#undef __glibcxx_want_atomic_float
#if !defined(__cpp_lib_atomic_lock_free_type_aliases)
@@ -876,7 +876,7 @@
# define __cpp_lib_atomic_lock_free_type_aliases 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_atomic_lock_free_type_aliases) &&
defined(__glibcxx_want_atomic_lock_free_type_aliases) */
+#endif /* !defined(__cpp_lib_atomic_lock_free_type_aliases) */
#undef __glibcxx_want_atomic_lock_free_type_aliases
#if !defined(__cpp_lib_atomic_ref)
@@ -886,7 +886,7 @@
# define __cpp_lib_atomic_ref 201806L
# endif
# endif
-#endif /* !defined(__cpp_lib_atomic_ref) && defined(__glibcxx_want_atomic_ref)
*/
+#endif /* !defined(__cpp_lib_atomic_ref) */
#undef __glibcxx_want_atomic_ref
#if !defined(__cpp_lib_atomic_value_initialization)
@@ -896,7 +896,7 @@
# define __cpp_lib_atomic_value_initialization 201911L
# endif
# endif
-#endif /* !defined(__cpp_lib_atomic_value_initialization) &&
defined(__glibcxx_want_atomic_value_initialization) */
+#endif /* !defined(__cpp_lib_atomic_value_initialization) */
#undef __glibcxx_want_atomic_value_initialization
#if !defined(__cpp_lib_bind_front)
@@ -911,7 +911,7 @@
# define __cpp_lib_bind_front 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_bind_front) && defined(__glibcxx_want_bind_front)
*/
+#endif /* !defined(__cpp_lib_bind_front) */
#undef __glibcxx_want_bind_front
#if !defined(__cpp_lib_bind_back)
@@ -926,7 +926,7 @@
# define __cpp_lib_bind_back 202202L
# endif
# endif
-#endif /* !defined(__cpp_lib_bind_back) && defined(__glibcxx_want_bind_back) */
+#endif /* !defined(__cpp_lib_bind_back) */
#undef __glibcxx_want_bind_back
#if !defined(__cpp_lib_starts_ends_with)
@@ -936,7 +936,7 @@
# define __cpp_lib_starts_ends_with 201711L
# endif
# endif
-#endif /* !defined(__cpp_lib_starts_ends_with) &&
defined(__glibcxx_want_starts_ends_with) */
+#endif /* !defined(__cpp_lib_starts_ends_with) */
#undef __glibcxx_want_starts_ends_with
#if !defined(__cpp_lib_bit_cast)
@@ -946,7 +946,7 @@
# define __cpp_lib_bit_cast 201806L
# endif
# endif
-#endif /* !defined(__cpp_lib_bit_cast) && defined(__glibcxx_want_bit_cast) */
+#endif /* !defined(__cpp_lib_bit_cast) */
#undef __glibcxx_want_bit_cast
#if !defined(__cpp_lib_bitops)
@@ -956,7 +956,7 @@
# define __cpp_lib_bitops 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_bitops) && defined(__glibcxx_want_bitops) */
+#endif /* !defined(__cpp_lib_bitops) */
#undef __glibcxx_want_bitops
#if !defined(__cpp_lib_bounded_array_traits)
@@ -966,7 +966,7 @@
# define __cpp_lib_bounded_array_traits 201902L
# endif
# endif
-#endif /* !defined(__cpp_lib_bounded_array_traits) &&
defined(__glibcxx_want_bounded_array_traits) */
+#endif /* !defined(__cpp_lib_bounded_array_traits) */
#undef __glibcxx_want_bounded_array_traits
#if !defined(__cpp_lib_concepts)
@@ -976,7 +976,7 @@
# define __cpp_lib_concepts 202002L
# endif
# endif
-#endif /* !defined(__cpp_lib_concepts) && defined(__glibcxx_want_concepts) */
+#endif /* !defined(__cpp_lib_concepts) */
#undef __glibcxx_want_concepts
#if !defined(__cpp_lib_optional)
@@ -996,7 +996,7 @@
# define __cpp_lib_optional 201606L
# endif
# endif
-#endif /* !defined(__cpp_lib_optional) && defined(__glibcxx_want_optional) */
+#endif /* !defined(__cpp_lib_optional) */
#undef __glibcxx_want_optional
#if !defined(__cpp_lib_optional_range_support)
@@ -1006,7 +1006,7 @@
# define __cpp_lib_optional_range_support 202406L
# endif
# endif
-#endif /* !defined(__cpp_lib_optional_range_support) &&
defined(__glibcxx_want_optional_range_support) */
+#endif /* !defined(__cpp_lib_optional_range_support) */
#undef __glibcxx_want_optional_range_support
#if !defined(__cpp_lib_destroying_delete)
@@ -1016,7 +1016,7 @@
# define __cpp_lib_destroying_delete 201806L
# endif
# endif
-#endif /* !defined(__cpp_lib_destroying_delete) &&
defined(__glibcxx_want_destroying_delete) */
+#endif /* !defined(__cpp_lib_destroying_delete) */
#undef __glibcxx_want_destroying_delete
#if !defined(__cpp_lib_constexpr_string_view)
@@ -1026,7 +1026,7 @@
# define __cpp_lib_constexpr_string_view 201811L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_string_view) &&
defined(__glibcxx_want_constexpr_string_view) */
+#endif /* !defined(__cpp_lib_constexpr_string_view) */
#undef __glibcxx_want_constexpr_string_view
#if !defined(__cpp_lib_endian)
@@ -1036,7 +1036,7 @@
# define __cpp_lib_endian 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_endian) && defined(__glibcxx_want_endian) */
+#endif /* !defined(__cpp_lib_endian) */
#undef __glibcxx_want_endian
#if !defined(__cpp_lib_int_pow2)
@@ -1046,7 +1046,7 @@
# define __cpp_lib_int_pow2 202002L
# endif
# endif
-#endif /* !defined(__cpp_lib_int_pow2) && defined(__glibcxx_want_int_pow2) */
+#endif /* !defined(__cpp_lib_int_pow2) */
#undef __glibcxx_want_int_pow2
#if !defined(__cpp_lib_integer_comparison_functions)
@@ -1056,7 +1056,7 @@
# define __cpp_lib_integer_comparison_functions 202002L
# endif
# endif
-#endif /* !defined(__cpp_lib_integer_comparison_functions) &&
defined(__glibcxx_want_integer_comparison_functions) */
+#endif /* !defined(__cpp_lib_integer_comparison_functions) */
#undef __glibcxx_want_integer_comparison_functions
#if !defined(__cpp_lib_is_constant_evaluated)
@@ -1066,7 +1066,7 @@
# define __cpp_lib_is_constant_evaluated 201811L
# endif
# endif
-#endif /* !defined(__cpp_lib_is_constant_evaluated) &&
defined(__glibcxx_want_is_constant_evaluated) */
+#endif /* !defined(__cpp_lib_is_constant_evaluated) */
#undef __glibcxx_want_is_constant_evaluated
#if !defined(__cpp_lib_constexpr_char_traits)
@@ -1081,7 +1081,7 @@
# define __cpp_lib_constexpr_char_traits 201611L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_char_traits) &&
defined(__glibcxx_want_constexpr_char_traits) */
+#endif /* !defined(__cpp_lib_constexpr_char_traits) */
#undef __glibcxx_want_constexpr_char_traits
#if !defined(__cpp_lib_is_layout_compatible)
@@ -1091,7 +1091,7 @@
# define __cpp_lib_is_layout_compatible 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_is_layout_compatible) &&
defined(__glibcxx_want_is_layout_compatible) */
+#endif /* !defined(__cpp_lib_is_layout_compatible) */
#undef __glibcxx_want_is_layout_compatible
#if !defined(__cpp_lib_is_nothrow_convertible)
@@ -1101,7 +1101,7 @@
# define __cpp_lib_is_nothrow_convertible 201806L
# endif
# endif
-#endif /* !defined(__cpp_lib_is_nothrow_convertible) &&
defined(__glibcxx_want_is_nothrow_convertible) */
+#endif /* !defined(__cpp_lib_is_nothrow_convertible) */
#undef __glibcxx_want_is_nothrow_convertible
#if !defined(__cpp_lib_is_pointer_interconvertible)
@@ -1111,7 +1111,7 @@
# define __cpp_lib_is_pointer_interconvertible 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_is_pointer_interconvertible) &&
defined(__glibcxx_want_is_pointer_interconvertible) */
+#endif /* !defined(__cpp_lib_is_pointer_interconvertible) */
#undef __glibcxx_want_is_pointer_interconvertible
#if !defined(__cpp_lib_math_constants)
@@ -1121,7 +1121,7 @@
# define __cpp_lib_math_constants 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_math_constants) &&
defined(__glibcxx_want_math_constants) */
+#endif /* !defined(__cpp_lib_math_constants) */
#undef __glibcxx_want_math_constants
#if !defined(__cpp_lib_make_obj_using_allocator)
@@ -1130,7 +1130,7 @@
# if defined(__glibcxx_want_all) ||
defined(__glibcxx_want_make_obj_using_allocator)
# endif
# endif
-#endif /* !defined(__cpp_lib_make_obj_using_allocator) &&
defined(__glibcxx_want_make_obj_using_allocator) */
+#endif /* !defined(__cpp_lib_make_obj_using_allocator) */
#undef __glibcxx_want_make_obj_using_allocator
#if !defined(__cpp_lib_remove_cvref)
@@ -1140,7 +1140,7 @@
# define __cpp_lib_remove_cvref 201711L
# endif
# endif
-#endif /* !defined(__cpp_lib_remove_cvref) &&
defined(__glibcxx_want_remove_cvref) */
+#endif /* !defined(__cpp_lib_remove_cvref) */
#undef __glibcxx_want_remove_cvref
#if !defined(__cpp_lib_source_location)
@@ -1150,7 +1150,7 @@
# define __cpp_lib_source_location 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_source_location) &&
defined(__glibcxx_want_source_location) */
+#endif /* !defined(__cpp_lib_source_location) */
#undef __glibcxx_want_source_location
#if !defined(__cpp_lib_span)
@@ -1165,7 +1165,7 @@
# define __cpp_lib_span 202002L
# endif
# endif
-#endif /* !defined(__cpp_lib_span) && defined(__glibcxx_want_span) */
+#endif /* !defined(__cpp_lib_span) */
#undef __glibcxx_want_span
#if !defined(__cpp_lib_mdspan)
@@ -1180,7 +1180,7 @@
# define __cpp_lib_mdspan 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_mdspan) && defined(__glibcxx_want_mdspan) */
+#endif /* !defined(__cpp_lib_mdspan) */
#undef __glibcxx_want_mdspan
#if !defined(__cpp_lib_aligned_accessor)
@@ -1190,7 +1190,7 @@
# define __cpp_lib_aligned_accessor 202411L
# endif
# endif
-#endif /* !defined(__cpp_lib_aligned_accessor) &&
defined(__glibcxx_want_aligned_accessor) */
+#endif /* !defined(__cpp_lib_aligned_accessor) */
#undef __glibcxx_want_aligned_accessor
#if !defined(__cpp_lib_padded_layouts)
@@ -1218,7 +1218,7 @@
# define __cpp_lib_ssize 201902L
# endif
# endif
-#endif /* !defined(__cpp_lib_ssize) && defined(__glibcxx_want_ssize) */
+#endif /* !defined(__cpp_lib_ssize) */
#undef __glibcxx_want_ssize
#if !defined(__cpp_lib_three_way_comparison)
@@ -1228,7 +1228,7 @@
# define __cpp_lib_three_way_comparison 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_three_way_comparison) &&
defined(__glibcxx_want_three_way_comparison) */
+#endif /* !defined(__cpp_lib_three_way_comparison) */
#undef __glibcxx_want_three_way_comparison
#if !defined(__cpp_lib_to_address)
@@ -1238,7 +1238,7 @@
# define __cpp_lib_to_address 201711L
# endif
# endif
-#endif /* !defined(__cpp_lib_to_address) && defined(__glibcxx_want_to_address)
*/
+#endif /* !defined(__cpp_lib_to_address) */
#undef __glibcxx_want_to_address
#if !defined(__cpp_lib_to_array)
@@ -1248,7 +1248,7 @@
# define __cpp_lib_to_array 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_to_array) && defined(__glibcxx_want_to_array) */
+#endif /* !defined(__cpp_lib_to_array) */
#undef __glibcxx_want_to_array
#if !defined(__cpp_lib_type_identity)
@@ -1258,7 +1258,7 @@
# define __cpp_lib_type_identity 201806L
# endif
# endif
-#endif /* !defined(__cpp_lib_type_identity) &&
defined(__glibcxx_want_type_identity) */
+#endif /* !defined(__cpp_lib_type_identity) */
#undef __glibcxx_want_type_identity
#if !defined(__cpp_lib_unwrap_ref)
@@ -1268,7 +1268,7 @@
# define __cpp_lib_unwrap_ref 201811L
# endif
# endif
-#endif /* !defined(__cpp_lib_unwrap_ref) && defined(__glibcxx_want_unwrap_ref)
*/
+#endif /* !defined(__cpp_lib_unwrap_ref) */
#undef __glibcxx_want_unwrap_ref
#if !defined(__cpp_lib_constexpr_iterator)
@@ -1278,7 +1278,7 @@
# define __cpp_lib_constexpr_iterator 201811L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_iterator) &&
defined(__glibcxx_want_constexpr_iterator) */
+#endif /* !defined(__cpp_lib_constexpr_iterator) */
#undef __glibcxx_want_constexpr_iterator
#if !defined(__cpp_lib_interpolate)
@@ -1288,7 +1288,7 @@
# define __cpp_lib_interpolate 201902L
# endif
# endif
-#endif /* !defined(__cpp_lib_interpolate) &&
defined(__glibcxx_want_interpolate) */
+#endif /* !defined(__cpp_lib_interpolate) */
#undef __glibcxx_want_interpolate
#if !defined(__cpp_lib_constexpr_utility)
@@ -1298,7 +1298,7 @@
# define __cpp_lib_constexpr_utility 201811L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_utility) &&
defined(__glibcxx_want_constexpr_utility) */
+#endif /* !defined(__cpp_lib_constexpr_utility) */
#undef __glibcxx_want_constexpr_utility
#if !defined(__cpp_lib_shift)
@@ -1313,7 +1313,7 @@
# define __cpp_lib_shift 201806L
# endif
# endif
-#endif /* !defined(__cpp_lib_shift) && defined(__glibcxx_want_shift) */
+#endif /* !defined(__cpp_lib_shift) */
#undef __glibcxx_want_shift
#if !defined(__cpp_lib_ranges)
@@ -1333,7 +1333,7 @@
# define __cpp_lib_ranges 202110L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges) && defined(__glibcxx_want_ranges) */
+#endif /* !defined(__cpp_lib_ranges) */
#undef __glibcxx_want_ranges
#if !defined(__cpp_lib_constexpr_numeric)
@@ -1343,7 +1343,7 @@
# define __cpp_lib_constexpr_numeric 201911L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_numeric) &&
defined(__glibcxx_want_constexpr_numeric) */
+#endif /* !defined(__cpp_lib_constexpr_numeric) */
#undef __glibcxx_want_constexpr_numeric
#if !defined(__cpp_lib_constexpr_functional)
@@ -1353,7 +1353,7 @@
# define __cpp_lib_constexpr_functional 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_functional) &&
defined(__glibcxx_want_constexpr_functional) */
+#endif /* !defined(__cpp_lib_constexpr_functional) */
#undef __glibcxx_want_constexpr_functional
#if !defined(__cpp_lib_constexpr_algorithms)
@@ -1368,7 +1368,7 @@
# define __cpp_lib_constexpr_algorithms 201806L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_algorithms) &&
defined(__glibcxx_want_constexpr_algorithms) */
+#endif /* !defined(__cpp_lib_constexpr_algorithms) */
#undef __glibcxx_want_constexpr_algorithms
#if !defined(__cpp_lib_constexpr_tuple)
@@ -1378,7 +1378,7 @@
# define __cpp_lib_constexpr_tuple 201811L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_tuple) &&
defined(__glibcxx_want_constexpr_tuple) */
+#endif /* !defined(__cpp_lib_constexpr_tuple) */
#undef __glibcxx_want_constexpr_tuple
#if !defined(__cpp_lib_constexpr_memory)
@@ -1393,7 +1393,7 @@
# define __cpp_lib_constexpr_memory 201811L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_memory) &&
defined(__glibcxx_want_constexpr_memory) */
+#endif /* !defined(__cpp_lib_constexpr_memory) */
#undef __glibcxx_want_constexpr_memory
#if !defined(__cpp_lib_atomic_shared_ptr)
@@ -1403,7 +1403,7 @@
# define __cpp_lib_atomic_shared_ptr 201711L
# endif
# endif
-#endif /* !defined(__cpp_lib_atomic_shared_ptr) &&
defined(__glibcxx_want_atomic_shared_ptr) */
+#endif /* !defined(__cpp_lib_atomic_shared_ptr) */
#undef __glibcxx_want_atomic_shared_ptr
#if !defined(__cpp_lib_atomic_wait)
@@ -1418,7 +1418,7 @@
# define __cpp_lib_atomic_wait 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_atomic_wait) &&
defined(__glibcxx_want_atomic_wait) */
+#endif /* !defined(__cpp_lib_atomic_wait) */
#undef __glibcxx_want_atomic_wait
#if !defined(__cpp_lib_barrier)
@@ -1428,7 +1428,7 @@
# define __cpp_lib_barrier 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_barrier) && defined(__glibcxx_want_barrier) */
+#endif /* !defined(__cpp_lib_barrier) */
#undef __glibcxx_want_barrier
#if !defined(__cpp_lib_format)
@@ -1443,7 +1443,7 @@
# define __cpp_lib_format 202304L
# endif
# endif
-#endif /* !defined(__cpp_lib_format) && defined(__glibcxx_want_format) */
+#endif /* !defined(__cpp_lib_format) */
#undef __glibcxx_want_format
#if !defined(__cpp_lib_format_uchar)
@@ -1453,7 +1453,7 @@
# define __cpp_lib_format_uchar 202311L
# endif
# endif
-#endif /* !defined(__cpp_lib_format_uchar) &&
defined(__glibcxx_want_format_uchar) */
+#endif /* !defined(__cpp_lib_format_uchar) */
#undef __glibcxx_want_format_uchar
#if !defined(__cpp_lib_constexpr_complex)
@@ -1463,7 +1463,7 @@
# define __cpp_lib_constexpr_complex 201711L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_complex) &&
defined(__glibcxx_want_constexpr_complex) */
+#endif /* !defined(__cpp_lib_constexpr_complex) */
#undef __glibcxx_want_constexpr_complex
#if !defined(__cpp_lib_constexpr_dynamic_alloc)
@@ -1473,7 +1473,7 @@
# define __cpp_lib_constexpr_dynamic_alloc 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_dynamic_alloc) &&
defined(__glibcxx_want_constexpr_dynamic_alloc) */
+#endif /* !defined(__cpp_lib_constexpr_dynamic_alloc) */
#undef __glibcxx_want_constexpr_dynamic_alloc
#if !defined(__cpp_lib_constexpr_string)
@@ -1493,7 +1493,7 @@
# define __cpp_lib_constexpr_string 201611L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_string) &&
defined(__glibcxx_want_constexpr_string) */
+#endif /* !defined(__cpp_lib_constexpr_string) */
#undef __glibcxx_want_constexpr_string
#if !defined(__cpp_lib_constexpr_vector)
@@ -1503,7 +1503,7 @@
# define __cpp_lib_constexpr_vector 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_vector) &&
defined(__glibcxx_want_constexpr_vector) */
+#endif /* !defined(__cpp_lib_constexpr_vector) */
#undef __glibcxx_want_constexpr_vector
#if !defined(__cpp_lib_constrained_equality)
@@ -1518,7 +1518,7 @@
# define __cpp_lib_constrained_equality 202403L
# endif
# endif
-#endif /* !defined(__cpp_lib_constrained_equality) &&
defined(__glibcxx_want_constrained_equality) */
+#endif /* !defined(__cpp_lib_constrained_equality) */
#undef __glibcxx_want_constrained_equality
#if !defined(__cpp_lib_erase_if)
@@ -1528,7 +1528,7 @@
# define __cpp_lib_erase_if 202002L
# endif
# endif
-#endif /* !defined(__cpp_lib_erase_if) && defined(__glibcxx_want_erase_if) */
+#endif /* !defined(__cpp_lib_erase_if) */
#undef __glibcxx_want_erase_if
#if !defined(__cpp_lib_generic_unordered_lookup)
@@ -1538,7 +1538,7 @@
# define __cpp_lib_generic_unordered_lookup 201811L
# endif
# endif
-#endif /* !defined(__cpp_lib_generic_unordered_lookup) &&
defined(__glibcxx_want_generic_unordered_lookup) */
+#endif /* !defined(__cpp_lib_generic_unordered_lookup) */
#undef __glibcxx_want_generic_unordered_lookup
#if !defined(__cpp_lib_jthread)
@@ -1548,7 +1548,7 @@
# define __cpp_lib_jthread 201911L
# endif
# endif
-#endif /* !defined(__cpp_lib_jthread) && defined(__glibcxx_want_jthread) */
+#endif /* !defined(__cpp_lib_jthread) */
#undef __glibcxx_want_jthread
#if !defined(__cpp_lib_latch)
@@ -1558,7 +1558,7 @@
# define __cpp_lib_latch 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_latch) && defined(__glibcxx_want_latch) */
+#endif /* !defined(__cpp_lib_latch) */
#undef __glibcxx_want_latch
#if !defined(__cpp_lib_list_remove_return_type)
@@ -1568,7 +1568,7 @@
# define __cpp_lib_list_remove_return_type 201806L
# endif
# endif
-#endif /* !defined(__cpp_lib_list_remove_return_type) &&
defined(__glibcxx_want_list_remove_return_type) */
+#endif /* !defined(__cpp_lib_list_remove_return_type) */
#undef __glibcxx_want_list_remove_return_type
#if !defined(__cpp_lib_polymorphic_allocator)
@@ -1578,7 +1578,7 @@
# define __cpp_lib_polymorphic_allocator 201902L
# endif
# endif
-#endif /* !defined(__cpp_lib_polymorphic_allocator) &&
defined(__glibcxx_want_polymorphic_allocator) */
+#endif /* !defined(__cpp_lib_polymorphic_allocator) */
#undef __glibcxx_want_polymorphic_allocator
#if !defined(__cpp_lib_move_iterator_concept)
@@ -1588,7 +1588,7 @@
# define __cpp_lib_move_iterator_concept 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_move_iterator_concept) &&
defined(__glibcxx_want_move_iterator_concept) */
+#endif /* !defined(__cpp_lib_move_iterator_concept) */
#undef __glibcxx_want_move_iterator_concept
#if !defined(__cpp_lib_semaphore)
@@ -1598,7 +1598,7 @@
# define __cpp_lib_semaphore 201907L
# endif
# endif
-#endif /* !defined(__cpp_lib_semaphore) && defined(__glibcxx_want_semaphore) */
+#endif /* !defined(__cpp_lib_semaphore) */
#undef __glibcxx_want_semaphore
#if !defined(__cpp_lib_smart_ptr_for_overwrite)
@@ -1608,7 +1608,7 @@
# define __cpp_lib_smart_ptr_for_overwrite 202002L
# endif
# endif
-#endif /* !defined(__cpp_lib_smart_ptr_for_overwrite) &&
defined(__glibcxx_want_smart_ptr_for_overwrite) */
+#endif /* !defined(__cpp_lib_smart_ptr_for_overwrite) */
#undef __glibcxx_want_smart_ptr_for_overwrite
#if !defined(__cpp_lib_syncbuf)
@@ -1618,7 +1618,7 @@
# define __cpp_lib_syncbuf 201803L
# endif
# endif
-#endif /* !defined(__cpp_lib_syncbuf) && defined(__glibcxx_want_syncbuf) */
+#endif /* !defined(__cpp_lib_syncbuf) */
#undef __glibcxx_want_syncbuf
#if !defined(__cpp_lib_byteswap)
@@ -1628,7 +1628,7 @@
# define __cpp_lib_byteswap 202110L
# endif
# endif
-#endif /* !defined(__cpp_lib_byteswap) && defined(__glibcxx_want_byteswap) */
+#endif /* !defined(__cpp_lib_byteswap) */
#undef __glibcxx_want_byteswap
#if !defined(__cpp_lib_constexpr_charconv)
@@ -1638,7 +1638,7 @@
# define __cpp_lib_constexpr_charconv 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_charconv) &&
defined(__glibcxx_want_constexpr_charconv) */
+#endif /* !defined(__cpp_lib_constexpr_charconv) */
#undef __glibcxx_want_constexpr_charconv
#if !defined(__cpp_lib_constexpr_typeinfo)
@@ -1648,7 +1648,7 @@
# define __cpp_lib_constexpr_typeinfo 202106L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_typeinfo) &&
defined(__glibcxx_want_constexpr_typeinfo) */
+#endif /* !defined(__cpp_lib_constexpr_typeinfo) */
#undef __glibcxx_want_constexpr_typeinfo
#if !defined(__cpp_lib_expected)
@@ -1658,7 +1658,7 @@
# define __cpp_lib_expected 202211L
# endif
# endif
-#endif /* !defined(__cpp_lib_expected) && defined(__glibcxx_want_expected) */
+#endif /* !defined(__cpp_lib_expected) */
#undef __glibcxx_want_expected
#if !defined(__cpp_lib_format_ranges)
@@ -1668,7 +1668,7 @@
# define __cpp_lib_format_ranges 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_format_ranges) &&
defined(__glibcxx_want_format_ranges) */
+#endif /* !defined(__cpp_lib_format_ranges) */
#undef __glibcxx_want_format_ranges
#if !defined(__cpp_lib_freestanding_algorithm)
@@ -1678,7 +1678,7 @@
# define __cpp_lib_freestanding_algorithm 202311L
# endif
# endif
-#endif /* !defined(__cpp_lib_freestanding_algorithm) &&
defined(__glibcxx_want_freestanding_algorithm) */
+#endif /* !defined(__cpp_lib_freestanding_algorithm) */
#undef __glibcxx_want_freestanding_algorithm
#if !defined(__cpp_lib_freestanding_array)
@@ -1688,7 +1688,7 @@
# define __cpp_lib_freestanding_array 202311L
# endif
# endif
-#endif /* !defined(__cpp_lib_freestanding_array) &&
defined(__glibcxx_want_freestanding_array) */
+#endif /* !defined(__cpp_lib_freestanding_array) */
#undef __glibcxx_want_freestanding_array
#if !defined(__cpp_lib_freestanding_cstring)
@@ -1698,7 +1698,7 @@
# define __cpp_lib_freestanding_cstring 202311L
# endif
# endif
-#endif /* !defined(__cpp_lib_freestanding_cstring) &&
defined(__glibcxx_want_freestanding_cstring) */
+#endif /* !defined(__cpp_lib_freestanding_cstring) */
#undef __glibcxx_want_freestanding_cstring
#if !defined(__cpp_lib_freestanding_expected)
@@ -1708,7 +1708,7 @@
# define __cpp_lib_freestanding_expected 202311L
# endif
# endif
-#endif /* !defined(__cpp_lib_freestanding_expected) &&
defined(__glibcxx_want_freestanding_expected) */
+#endif /* !defined(__cpp_lib_freestanding_expected) */
#undef __glibcxx_want_freestanding_expected
#if !defined(__cpp_lib_freestanding_optional)
@@ -1718,7 +1718,7 @@
# define __cpp_lib_freestanding_optional 202311L
# endif
# endif
-#endif /* !defined(__cpp_lib_freestanding_optional) &&
defined(__glibcxx_want_freestanding_optional) */
+#endif /* !defined(__cpp_lib_freestanding_optional) */
#undef __glibcxx_want_freestanding_optional
#if !defined(__cpp_lib_freestanding_string_view)
@@ -1728,7 +1728,7 @@
# define __cpp_lib_freestanding_string_view 202311L
# endif
# endif
-#endif /* !defined(__cpp_lib_freestanding_string_view) &&
defined(__glibcxx_want_freestanding_string_view) */
+#endif /* !defined(__cpp_lib_freestanding_string_view) */
#undef __glibcxx_want_freestanding_string_view
#if !defined(__cpp_lib_freestanding_variant)
@@ -1738,7 +1738,7 @@
# define __cpp_lib_freestanding_variant 202311L
# endif
# endif
-#endif /* !defined(__cpp_lib_freestanding_variant) &&
defined(__glibcxx_want_freestanding_variant) */
+#endif /* !defined(__cpp_lib_freestanding_variant) */
#undef __glibcxx_want_freestanding_variant
#if !defined(__cpp_lib_invoke_r)
@@ -1748,7 +1748,7 @@
# define __cpp_lib_invoke_r 202106L
# endif
# endif
-#endif /* !defined(__cpp_lib_invoke_r) && defined(__glibcxx_want_invoke_r) */
+#endif /* !defined(__cpp_lib_invoke_r) */
#undef __glibcxx_want_invoke_r
#if !defined(__cpp_lib_is_scoped_enum)
@@ -1758,7 +1758,7 @@
# define __cpp_lib_is_scoped_enum 202011L
# endif
# endif
-#endif /* !defined(__cpp_lib_is_scoped_enum) &&
defined(__glibcxx_want_is_scoped_enum) */
+#endif /* !defined(__cpp_lib_is_scoped_enum) */
#undef __glibcxx_want_is_scoped_enum
#if !defined(__cpp_lib_reference_from_temporary)
@@ -1768,7 +1768,7 @@
# define __cpp_lib_reference_from_temporary 202202L
# endif
# endif
-#endif /* !defined(__cpp_lib_reference_from_temporary) &&
defined(__glibcxx_want_reference_from_temporary) */
+#endif /* !defined(__cpp_lib_reference_from_temporary) */
#undef __glibcxx_want_reference_from_temporary
#if !defined(__cpp_lib_containers_ranges)
@@ -1778,7 +1778,7 @@
# define __cpp_lib_containers_ranges 202202L
# endif
# endif
-#endif /* !defined(__cpp_lib_containers_ranges) &&
defined(__glibcxx_want_containers_ranges) */
+#endif /* !defined(__cpp_lib_containers_ranges) */
#undef __glibcxx_want_containers_ranges
#if !defined(__cpp_lib_ranges_to_container)
@@ -1788,7 +1788,7 @@
# define __cpp_lib_ranges_to_container 202202L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_to_container) &&
defined(__glibcxx_want_ranges_to_container) */
+#endif /* !defined(__cpp_lib_ranges_to_container) */
#undef __glibcxx_want_ranges_to_container
#if !defined(__cpp_lib_ranges_zip)
@@ -1798,7 +1798,7 @@
# define __cpp_lib_ranges_zip 202110L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_zip) && defined(__glibcxx_want_ranges_zip)
*/
+#endif /* !defined(__cpp_lib_ranges_zip) */
#undef __glibcxx_want_ranges_zip
#if !defined(__cpp_lib_ranges_chunk)
@@ -1808,7 +1808,7 @@
# define __cpp_lib_ranges_chunk 202202L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_chunk) &&
defined(__glibcxx_want_ranges_chunk) */
+#endif /* !defined(__cpp_lib_ranges_chunk) */
#undef __glibcxx_want_ranges_chunk
#if !defined(__cpp_lib_ranges_slide)
@@ -1818,7 +1818,7 @@
# define __cpp_lib_ranges_slide 202202L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_slide) &&
defined(__glibcxx_want_ranges_slide) */
+#endif /* !defined(__cpp_lib_ranges_slide) */
#undef __glibcxx_want_ranges_slide
#if !defined(__cpp_lib_ranges_chunk_by)
@@ -1828,7 +1828,7 @@
# define __cpp_lib_ranges_chunk_by 202202L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_chunk_by) &&
defined(__glibcxx_want_ranges_chunk_by) */
+#endif /* !defined(__cpp_lib_ranges_chunk_by) */
#undef __glibcxx_want_ranges_chunk_by
#if !defined(__cpp_lib_ranges_join_with)
@@ -1838,7 +1838,7 @@
# define __cpp_lib_ranges_join_with 202202L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_join_with) &&
defined(__glibcxx_want_ranges_join_with) */
+#endif /* !defined(__cpp_lib_ranges_join_with) */
#undef __glibcxx_want_ranges_join_with
#if !defined(__cpp_lib_ranges_repeat)
@@ -1848,7 +1848,7 @@
# define __cpp_lib_ranges_repeat 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_repeat) &&
defined(__glibcxx_want_ranges_repeat) */
+#endif /* !defined(__cpp_lib_ranges_repeat) */
#undef __glibcxx_want_ranges_repeat
#if !defined(__cpp_lib_ranges_stride)
@@ -1858,7 +1858,7 @@
# define __cpp_lib_ranges_stride 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_stride) &&
defined(__glibcxx_want_ranges_stride) */
+#endif /* !defined(__cpp_lib_ranges_stride) */
#undef __glibcxx_want_ranges_stride
#if !defined(__cpp_lib_ranges_cartesian_product)
@@ -1868,7 +1868,7 @@
# define __cpp_lib_ranges_cartesian_product 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_cartesian_product) &&
defined(__glibcxx_want_ranges_cartesian_product) */
+#endif /* !defined(__cpp_lib_ranges_cartesian_product) */
#undef __glibcxx_want_ranges_cartesian_product
#if !defined(__cpp_lib_ranges_as_rvalue)
@@ -1878,7 +1878,7 @@
# define __cpp_lib_ranges_as_rvalue 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_as_rvalue) &&
defined(__glibcxx_want_ranges_as_rvalue) */
+#endif /* !defined(__cpp_lib_ranges_as_rvalue) */
#undef __glibcxx_want_ranges_as_rvalue
#if !defined(__cpp_lib_ranges_as_const)
@@ -1888,7 +1888,7 @@
# define __cpp_lib_ranges_as_const 202311L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_as_const) &&
defined(__glibcxx_want_ranges_as_const) */
+#endif /* !defined(__cpp_lib_ranges_as_const) */
#undef __glibcxx_want_ranges_as_const
#if !defined(__cpp_lib_ranges_enumerate)
@@ -1898,7 +1898,7 @@
# define __cpp_lib_ranges_enumerate 202302L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_enumerate) &&
defined(__glibcxx_want_ranges_enumerate) */
+#endif /* !defined(__cpp_lib_ranges_enumerate) */
#undef __glibcxx_want_ranges_enumerate
#if !defined(__cpp_lib_ranges_fold)
@@ -1908,7 +1908,7 @@
# define __cpp_lib_ranges_fold 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_fold) &&
defined(__glibcxx_want_ranges_fold) */
+#endif /* !defined(__cpp_lib_ranges_fold) */
#undef __glibcxx_want_ranges_fold
#if !defined(__cpp_lib_ranges_contains)
@@ -1918,7 +1918,7 @@
# define __cpp_lib_ranges_contains 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_contains) &&
defined(__glibcxx_want_ranges_contains) */
+#endif /* !defined(__cpp_lib_ranges_contains) */
#undef __glibcxx_want_ranges_contains
#if !defined(__cpp_lib_ranges_iota)
@@ -1928,7 +1928,7 @@
# define __cpp_lib_ranges_iota 202202L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_iota) &&
defined(__glibcxx_want_ranges_iota) */
+#endif /* !defined(__cpp_lib_ranges_iota) */
#undef __glibcxx_want_ranges_iota
#if !defined(__cpp_lib_ranges_find_last)
@@ -1938,7 +1938,7 @@
# define __cpp_lib_ranges_find_last 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_find_last) &&
defined(__glibcxx_want_ranges_find_last) */
+#endif /* !defined(__cpp_lib_ranges_find_last) */
#undef __glibcxx_want_ranges_find_last
#if !defined(__cpp_lib_ranges_starts_ends_with)
@@ -1948,7 +1948,7 @@
# define __cpp_lib_ranges_starts_ends_with 202106L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_starts_ends_with) &&
defined(__glibcxx_want_ranges_starts_ends_with) */
+#endif /* !defined(__cpp_lib_ranges_starts_ends_with) */
#undef __glibcxx_want_ranges_starts_ends_with
#if !defined(__cpp_lib_constexpr_bitset)
@@ -1958,7 +1958,7 @@
# define __cpp_lib_constexpr_bitset 202202L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_bitset) &&
defined(__glibcxx_want_constexpr_bitset) */
+#endif /* !defined(__cpp_lib_constexpr_bitset) */
#undef __glibcxx_want_constexpr_bitset
#if !defined(__cpp_lib_stdatomic_h)
@@ -1968,7 +1968,7 @@
# define __cpp_lib_stdatomic_h 202011L
# endif
# endif
-#endif /* !defined(__cpp_lib_stdatomic_h) &&
defined(__glibcxx_want_stdatomic_h) */
+#endif /* !defined(__cpp_lib_stdatomic_h) */
#undef __glibcxx_want_stdatomic_h
#if !defined(__cpp_lib_adaptor_iterator_pair_constructor)
@@ -1978,7 +1978,7 @@
# define __cpp_lib_adaptor_iterator_pair_constructor 202106L
# endif
# endif
-#endif /* !defined(__cpp_lib_adaptor_iterator_pair_constructor) &&
defined(__glibcxx_want_adaptor_iterator_pair_constructor) */
+#endif /* !defined(__cpp_lib_adaptor_iterator_pair_constructor) */
#undef __glibcxx_want_adaptor_iterator_pair_constructor
#if !defined(__cpp_lib_flat_map)
@@ -1988,7 +1988,7 @@
# define __cpp_lib_flat_map 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_flat_map) && defined(__glibcxx_want_flat_map) */
+#endif /* !defined(__cpp_lib_flat_map) */
#undef __glibcxx_want_flat_map
#if !defined(__cpp_lib_flat_set)
@@ -1998,7 +1998,7 @@
# define __cpp_lib_flat_set 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_flat_set) && defined(__glibcxx_want_flat_set) */
+#endif /* !defined(__cpp_lib_flat_set) */
#undef __glibcxx_want_flat_set
#if !defined(__cpp_lib_formatters)
@@ -2008,7 +2008,7 @@
# define __cpp_lib_formatters 202302L
# endif
# endif
-#endif /* !defined(__cpp_lib_formatters) && defined(__glibcxx_want_formatters)
*/
+#endif /* !defined(__cpp_lib_formatters) */
#undef __glibcxx_want_formatters
#if !defined(__cpp_lib_forward_like)
@@ -2018,7 +2018,7 @@
# define __cpp_lib_forward_like 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_forward_like) &&
defined(__glibcxx_want_forward_like) */
+#endif /* !defined(__cpp_lib_forward_like) */
#undef __glibcxx_want_forward_like
#if !defined(__cpp_lib_generator)
@@ -2028,7 +2028,7 @@
# define __cpp_lib_generator 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_generator) && defined(__glibcxx_want_generator) */
+#endif /* !defined(__cpp_lib_generator) */
#undef __glibcxx_want_generator
#if !defined(__cpp_lib_ios_noreplace)
@@ -2038,7 +2038,7 @@
# define __cpp_lib_ios_noreplace 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_ios_noreplace) &&
defined(__glibcxx_want_ios_noreplace) */
+#endif /* !defined(__cpp_lib_ios_noreplace) */
#undef __glibcxx_want_ios_noreplace
#if !defined(__cpp_lib_move_only_function)
@@ -2048,7 +2048,7 @@
# define __cpp_lib_move_only_function 202110L
# endif
# endif
-#endif /* !defined(__cpp_lib_move_only_function) &&
defined(__glibcxx_want_move_only_function) */
+#endif /* !defined(__cpp_lib_move_only_function) */
#undef __glibcxx_want_move_only_function
#if !defined(__cpp_lib_copyable_function)
@@ -2058,7 +2058,7 @@
# define __cpp_lib_copyable_function 202306L
# endif
# endif
-#endif /* !defined(__cpp_lib_copyable_function) &&
defined(__glibcxx_want_copyable_function) */
+#endif /* !defined(__cpp_lib_copyable_function) */
#undef __glibcxx_want_copyable_function
#if !defined(__cpp_lib_function_ref)
@@ -2068,7 +2068,7 @@
# define __cpp_lib_function_ref 202306L
# endif
# endif
-#endif /* !defined(__cpp_lib_function_ref) &&
defined(__glibcxx_want_function_ref) */
+#endif /* !defined(__cpp_lib_function_ref) */
#undef __glibcxx_want_function_ref
#if !defined(__cpp_lib_out_ptr)
@@ -2078,7 +2078,7 @@
# define __cpp_lib_out_ptr 202311L
# endif
# endif
-#endif /* !defined(__cpp_lib_out_ptr) && defined(__glibcxx_want_out_ptr) */
+#endif /* !defined(__cpp_lib_out_ptr) */
#undef __glibcxx_want_out_ptr
#if !defined(__cpp_lib_print)
@@ -2088,7 +2088,7 @@
# define __cpp_lib_print 202211L
# endif
# endif
-#endif /* !defined(__cpp_lib_print) && defined(__glibcxx_want_print) */
+#endif /* !defined(__cpp_lib_print) */
#undef __glibcxx_want_print
#if !defined(__cpp_lib_spanstream)
@@ -2098,7 +2098,7 @@
# define __cpp_lib_spanstream 202106L
# endif
# endif
-#endif /* !defined(__cpp_lib_spanstream) && defined(__glibcxx_want_spanstream)
*/
+#endif /* !defined(__cpp_lib_spanstream) */
#undef __glibcxx_want_spanstream
#if !defined(__cpp_lib_stacktrace)
@@ -2108,7 +2108,7 @@
# define __cpp_lib_stacktrace 202011L
# endif
# endif
-#endif /* !defined(__cpp_lib_stacktrace) && defined(__glibcxx_want_stacktrace)
*/
+#endif /* !defined(__cpp_lib_stacktrace) */
#undef __glibcxx_want_stacktrace
#if !defined(__cpp_lib_start_lifetime_as)
@@ -2118,7 +2118,7 @@
# define __cpp_lib_start_lifetime_as 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_start_lifetime_as) &&
defined(__glibcxx_want_start_lifetime_as) */
+#endif /* !defined(__cpp_lib_start_lifetime_as) */
#undef __glibcxx_want_start_lifetime_as
#if !defined(__cpp_lib_string_contains)
@@ -2128,7 +2128,7 @@
# define __cpp_lib_string_contains 202011L
# endif
# endif
-#endif /* !defined(__cpp_lib_string_contains) &&
defined(__glibcxx_want_string_contains) */
+#endif /* !defined(__cpp_lib_string_contains) */
#undef __glibcxx_want_string_contains
#if !defined(__cpp_lib_string_resize_and_overwrite)
@@ -2138,7 +2138,7 @@
# define __cpp_lib_string_resize_and_overwrite 202110L
# endif
# endif
-#endif /* !defined(__cpp_lib_string_resize_and_overwrite) &&
defined(__glibcxx_want_string_resize_and_overwrite) */
+#endif /* !defined(__cpp_lib_string_resize_and_overwrite) */
#undef __glibcxx_want_string_resize_and_overwrite
#if !defined(__cpp_lib_to_underlying)
@@ -2148,7 +2148,7 @@
# define __cpp_lib_to_underlying 202102L
# endif
# endif
-#endif /* !defined(__cpp_lib_to_underlying) &&
defined(__glibcxx_want_to_underlying) */
+#endif /* !defined(__cpp_lib_to_underlying) */
#undef __glibcxx_want_to_underlying
#if !defined(__cpp_lib_tuple_like)
@@ -2163,7 +2163,7 @@
# define __cpp_lib_tuple_like 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_tuple_like) && defined(__glibcxx_want_tuple_like)
*/
+#endif /* !defined(__cpp_lib_tuple_like) */
#undef __glibcxx_want_tuple_like
#if !defined(__cpp_lib_unreachable)
@@ -2173,7 +2173,7 @@
# define __cpp_lib_unreachable 202202L
# endif
# endif
-#endif /* !defined(__cpp_lib_unreachable) &&
defined(__glibcxx_want_unreachable) */
+#endif /* !defined(__cpp_lib_unreachable) */
#undef __glibcxx_want_unreachable
#if !defined(__cpp_lib_algorithm_default_value_type)
@@ -2183,7 +2183,7 @@
# define __cpp_lib_algorithm_default_value_type 202403L
# endif
# endif
-#endif /* !defined(__cpp_lib_algorithm_default_value_type) &&
defined(__glibcxx_want_algorithm_default_value_type) */
+#endif /* !defined(__cpp_lib_algorithm_default_value_type) */
#undef __glibcxx_want_algorithm_default_value_type
#if !defined(__cpp_lib_constexpr_new)
@@ -2193,7 +2193,7 @@
# define __cpp_lib_constexpr_new 202406L
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_new) &&
defined(__glibcxx_want_constexpr_new) */
+#endif /* !defined(__cpp_lib_constexpr_new) */
#undef __glibcxx_want_constexpr_new
#if !defined(__cpp_lib_debugging)
@@ -2203,7 +2203,7 @@
# define __cpp_lib_debugging 202403L
# endif
# endif
-#endif /* !defined(__cpp_lib_debugging) && defined(__glibcxx_want_debugging) */
+#endif /* !defined(__cpp_lib_debugging) */
#undef __glibcxx_want_debugging
#if !defined(__cpp_lib_fstream_native_handle)
@@ -2213,7 +2213,7 @@
# define __cpp_lib_fstream_native_handle 202306L
# endif
# endif
-#endif /* !defined(__cpp_lib_fstream_native_handle) &&
defined(__glibcxx_want_fstream_native_handle) */
+#endif /* !defined(__cpp_lib_fstream_native_handle) */
#undef __glibcxx_want_fstream_native_handle
#if !defined(__cpp_lib_is_virtual_base_of)
@@ -2223,7 +2223,7 @@
# define __cpp_lib_is_virtual_base_of 202406L
# endif
# endif
-#endif /* !defined(__cpp_lib_is_virtual_base_of) &&
defined(__glibcxx_want_is_virtual_base_of) */
+#endif /* !defined(__cpp_lib_is_virtual_base_of) */
#undef __glibcxx_want_is_virtual_base_of
#if !defined(__cpp_lib_ranges_cache_latest)
@@ -2233,7 +2233,7 @@
# define __cpp_lib_ranges_cache_latest 202411L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_cache_latest) &&
defined(__glibcxx_want_ranges_cache_latest) */
+#endif /* !defined(__cpp_lib_ranges_cache_latest) */
#undef __glibcxx_want_ranges_cache_latest
#if !defined(__cpp_lib_ranges_concat)
@@ -2243,7 +2243,7 @@
# define __cpp_lib_ranges_concat 202403L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_concat) &&
defined(__glibcxx_want_ranges_concat) */
+#endif /* !defined(__cpp_lib_ranges_concat) */
#undef __glibcxx_want_ranges_concat
#if !defined(__cpp_lib_ratio)
@@ -2253,7 +2253,7 @@
# define __cpp_lib_ratio 202306L
# endif
# endif
-#endif /* !defined(__cpp_lib_ratio) && defined(__glibcxx_want_ratio) */
+#endif /* !defined(__cpp_lib_ratio) */
#undef __glibcxx_want_ratio
#if !defined(__cpp_lib_reference_wrapper)
@@ -2263,7 +2263,7 @@
# define __cpp_lib_reference_wrapper 202403L
# endif
# endif
-#endif /* !defined(__cpp_lib_reference_wrapper) &&
defined(__glibcxx_want_reference_wrapper) */
+#endif /* !defined(__cpp_lib_reference_wrapper) */
#undef __glibcxx_want_reference_wrapper
#if !defined(__cpp_lib_saturation_arithmetic)
@@ -2273,7 +2273,7 @@
# define __cpp_lib_saturation_arithmetic 202311L
# endif
# endif
-#endif /* !defined(__cpp_lib_saturation_arithmetic) &&
defined(__glibcxx_want_saturation_arithmetic) */
+#endif /* !defined(__cpp_lib_saturation_arithmetic) */
#undef __glibcxx_want_saturation_arithmetic
#if !defined(__cpp_lib_span_initializer_list)
@@ -2283,7 +2283,7 @@
# define __cpp_lib_span_initializer_list 202311L
# endif
# endif
-#endif /* !defined(__cpp_lib_span_initializer_list) &&
defined(__glibcxx_want_span_initializer_list) */
+#endif /* !defined(__cpp_lib_span_initializer_list) */
#undef __glibcxx_want_span_initializer_list
#if !defined(__cpp_lib_text_encoding)
@@ -2293,7 +2293,7 @@
# define __cpp_lib_text_encoding 202306L
# endif
# endif
-#endif /* !defined(__cpp_lib_text_encoding) &&
defined(__glibcxx_want_text_encoding) */
+#endif /* !defined(__cpp_lib_text_encoding) */
#undef __glibcxx_want_text_encoding
#if !defined(__cpp_lib_ranges_to_input)
@@ -2303,7 +2303,7 @@
# define __cpp_lib_ranges_to_input 202502L
# endif
# endif
-#endif /* !defined(__cpp_lib_ranges_to_input) &&
defined(__glibcxx_want_ranges_to_input) */
+#endif /* !defined(__cpp_lib_ranges_to_input) */
#undef __glibcxx_want_ranges_to_input
#if !defined(__cpp_lib_to_string)
@@ -2313,7 +2313,7 @@
# define __cpp_lib_to_string 202306L
# endif
# endif
-#endif /* !defined(__cpp_lib_to_string) && defined(__glibcxx_want_to_string) */
+#endif /* !defined(__cpp_lib_to_string) */
#undef __glibcxx_want_to_string
#if !defined(__cpp_lib_modules)
@@ -2323,7 +2323,7 @@
# define __cpp_lib_modules 202207L
# endif
# endif
-#endif /* !defined(__cpp_lib_modules) && defined(__glibcxx_want_modules) */
+#endif /* !defined(__cpp_lib_modules) */
#undef __glibcxx_want_modules
#if !defined(__cpp_lib_inplace_vector)
@@ -2333,7 +2333,7 @@
# define __cpp_lib_inplace_vector 202406L
# endif
# endif
-#endif /* !defined(__cpp_lib_inplace_vector) &&
defined(__glibcxx_want_inplace_vector) */
+#endif /* !defined(__cpp_lib_inplace_vector) */
#undef __glibcxx_want_inplace_vector
#if !defined(__cpp_lib_indirect)
@@ -2343,7 +2343,7 @@
# define __cpp_lib_indirect 202502L
# endif
# endif
-#endif /* !defined(__cpp_lib_indirect) && defined(__glibcxx_want_indirect) */
+#endif /* !defined(__cpp_lib_indirect) */
#undef __glibcxx_want_indirect
#if !defined(__cpp_lib_polymorphic)
@@ -2353,7 +2353,7 @@
# define __cpp_lib_polymorphic 202502L
# endif
# endif
-#endif /* !defined(__cpp_lib_polymorphic) &&
defined(__glibcxx_want_polymorphic) */
+#endif /* !defined(__cpp_lib_polymorphic) */
#undef __glibcxx_want_polymorphic
#if !defined(__cpp_lib_smart_ptr_owner_equality)
@@ -2363,7 +2363,7 @@
# define __cpp_lib_smart_ptr_owner_equality 202306L
# endif
# endif
-#endif /* !defined(__cpp_lib_smart_ptr_owner_equality) &&
defined(__glibcxx_want_smart_ptr_owner_equality) */
+#endif /* !defined(__cpp_lib_smart_ptr_owner_equality) */
#undef __glibcxx_want_smart_ptr_owner_equality
#if !defined(__cpp_lib_sstream_from_string_view)
@@ -2373,7 +2373,7 @@
# define __cpp_lib_sstream_from_string_view 202306L
# endif
# endif
-#endif /* !defined(__cpp_lib_sstream_from_string_view) &&
defined(__glibcxx_want_sstream_from_string_view) */
+#endif /* !defined(__cpp_lib_sstream_from_string_view) */
#undef __glibcxx_want_sstream_from_string_view
#if !defined(__cpp_lib_type_order)
@@ -2383,7 +2383,7 @@
# define __cpp_lib_type_order 202506L
# endif
# endif
-#endif /* !defined(__cpp_lib_type_order) && defined(__glibcxx_want_type_order)
*/
+#endif /* !defined(__cpp_lib_type_order) */
#undef __glibcxx_want_type_order
#if !defined(__cpp_lib_exception_ptr_cast)
@@ -2393,7 +2393,7 @@
# define __cpp_lib_exception_ptr_cast 202506L
# endif
# endif
-#endif /* !defined(__cpp_lib_exception_ptr_cast) &&
defined(__glibcxx_want_exception_ptr_cast) */
+#endif /* !defined(__cpp_lib_exception_ptr_cast) */
#undef __glibcxx_want_exception_ptr_cast
#if !defined(__cpp_lib_bitset)
@@ -2403,7 +2403,7 @@
# define __cpp_lib_bitset 202306L
# endif
# endif
-#endif /* !defined(__cpp_lib_bitset) && defined(__glibcxx_want_bitset) */
+#endif /* !defined(__cpp_lib_bitset) */
#undef __glibcxx_want_bitset
#if !defined(__cpp_lib_constexpr_exceptions)
@@ -2412,7 +2412,7 @@
# if defined(__glibcxx_want_all) ||
defined(__glibcxx_want_constexpr_exceptions)
# endif
# endif
-#endif /* !defined(__cpp_lib_constexpr_exceptions) &&
defined(__glibcxx_want_constexpr_exceptions) */
+#endif /* !defined(__cpp_lib_constexpr_exceptions) */
#undef __glibcxx_want_constexpr_exceptions
#if !defined(__cpp_lib_philox_engine)
@@ -2422,7 +2422,7 @@
# define __cpp_lib_philox_engine 202406L
# endif
# endif
-#endif /* !defined(__cpp_lib_philox_engine) &&
defined(__glibcxx_want_philox_engine) */
+#endif /* !defined(__cpp_lib_philox_engine) */
#undef __glibcxx_want_philox_engine
#undef __glibcxx_want_all
diff --git a/libstdc++-v3/include/bits/version.tpl
b/libstdc++-v3/include/bits/version.tpl
index ccda71d6bcfe..ff4fd31bc29a 100644
--- a/libstdc++-v3/include/bits/version.tpl
+++ b/libstdc++-v3/include/bits/version.tpl
@@ -132,10 +132,10 @@ h
This macro block defines two versions of each FTM:
- 1. __glibcxx_NAME, which is defined unconditionally, and
+ 1. __glibcxx_NAME, which is defined if its conditions are met, and
2. __cpp_lib_NAME, which is defined only if marked as wanted.
- This allows FTMs to depend on eachother in their definitions without messing
+ This allows FTMs to depend on each other in their definitions without messing
with the exported values.
This can also be used by bits that do not want to expose FTMs that they can't
@@ -155,7 +155,7 @@ h
# endif
/*{ ENDFOR values
}*/# endif
-#endif /* !defined(__cpp_lib_/*{name}*/) && defined(__glibcxx_want_/*{name}*/)
*/
+#endif /* !defined(__cpp_lib_/*{name}*/) */
#undef __glibcxx_want_/*{name
}*//*{ (unless (last-for?) "\n\n" "\n")}*/
/*{ ENDFOR ftms }*//*{
--
2.51.0
