Skip to content

Commit

Permalink
Don't set FTM
Browse files Browse the repository at this point in the history
  • Loading branch information
@H-G-Hristov
H-G-Hristov committed Jul 15, 2024
1 parent bda678e commit cbf570f
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 25 deletions.
2 changes: 0 additions & 2 deletions libcxx/docs/FeatureTestMacroTable.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,6 @@ Status
---------------------------------------------------------- -----------------
``__cpp_lib_philox_engine`` *unimplemented*
---------------------------------------------------------- -----------------
``__cpp_lib_ranges`` ``202406L``
---------------------------------------------------------- -----------------
``__cpp_lib_ranges_concat`` *unimplemented*
---------------------------------------------------------- -----------------
``__cpp_lib_ratio`` ``202306L``
Expand Down
5 changes: 1 addition & 4 deletions libcxx/include/version
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,8 @@ __cpp_lib_philox_engine 202406L <random>
__cpp_lib_polymorphic_allocator 201902L <memory_resource>
__cpp_lib_print 202207L <ostream> <print>
__cpp_lib_quoted_string_io 201304L <iomanip>
__cpp_lib_ranges 202406L <algorithm> <functional> <iterator>
__cpp_lib_ranges 202207L <algorithm> <functional> <iterator>
<memory> <ranges>
202207L // C++20
__cpp_lib_ranges_as_const 202207L <ranges>
__cpp_lib_ranges_as_rvalue 202207L <ranges>
__cpp_lib_ranges_chunk 202202L <ranges>
Expand Down Expand Up @@ -535,8 +534,6 @@ __cpp_lib_void_t 201411L <type_traits>
# undef __cpp_lib_out_ptr
// # define __cpp_lib_out_ptr 202311L
// # define __cpp_lib_philox_engine 202406L
# undef __cpp_lib_ranges
# define __cpp_lib_ranges 202406L
// # define __cpp_lib_ranges_concat 202403L
# define __cpp_lib_ratio 202306L
// # define __cpp_lib_rcu 202306L
Expand Down
5 changes: 2 additions & 3 deletions ...language.support/support.limits/support.limits.general/algorithm.version.compile.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
__cpp_lib_freestanding_algorithm 202311L [C++26]
__cpp_lib_parallel_algorithm 201603L [C++17]
__cpp_lib_ranges 202207L [C++20]
202406L [C++26]
__cpp_lib_ranges_contains 202207L [C++23]
__cpp_lib_ranges_starts_ends_with 202106L [C++23]
__cpp_lib_robust_nonmodifying_seq_ops 201304L [C++14]
Expand Down Expand Up @@ -402,8 +401,8 @@
# ifndef __cpp_lib_ranges
# error "__cpp_lib_ranges should be defined in c++26"
# endif
# if __cpp_lib_ranges != 202406L
# error "__cpp_lib_ranges should have the value 202406L in c++26"
# if __cpp_lib_ranges != 202207L
# error "__cpp_lib_ranges should have the value 202207L in c++26"
# endif

# ifndef __cpp_lib_ranges_contains
Expand Down
5 changes: 2 additions & 3 deletions ...anguage.support/support.limits/support.limits.general/functional.version.compile.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
__cpp_lib_move_only_function 202110L [C++23]
__cpp_lib_not_fn 201603L [C++17]
__cpp_lib_ranges 202207L [C++20]
202406L [C++26]
__cpp_lib_reference_wrapper 202403L [C++26]
__cpp_lib_result_of_sfinae 201210L [C++14]
__cpp_lib_transparent_operators 201210L [C++14]
Expand Down Expand Up @@ -532,8 +531,8 @@
# ifndef __cpp_lib_ranges
# error "__cpp_lib_ranges should be defined in c++26"
# endif
# if __cpp_lib_ranges != 202406L
# error "__cpp_lib_ranges should have the value 202406L in c++26"
# if __cpp_lib_ranges != 202207L
# error "__cpp_lib_ranges should have the value 202207L in c++26"
# endif

# ifndef __cpp_lib_reference_wrapper
Expand Down
5 changes: 2 additions & 3 deletions .../language.support/support.limits/support.limits.general/iterator.version.compile.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
__cpp_lib_nonmember_container_access 201411L [C++17]
__cpp_lib_null_iterators 201304L [C++14]
__cpp_lib_ranges 202207L [C++20]
202406L [C++26]
__cpp_lib_ssize 201902L [C++20]
*/

Expand Down Expand Up @@ -314,8 +313,8 @@
# ifndef __cpp_lib_ranges
# error "__cpp_lib_ranges should be defined in c++26"
# endif
# if __cpp_lib_ranges != 202406L
# error "__cpp_lib_ranges should have the value 202406L in c++26"
# if __cpp_lib_ranges != 202207L
# error "__cpp_lib_ranges should have the value 202207L in c++26"
# endif

# ifndef __cpp_lib_ssize
Expand Down
5 changes: 2 additions & 3 deletions ...td/language.support/support.limits/support.limits.general/memory.version.compile.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
__cpp_lib_out_ptr 202106L [C++23]
202311L [C++26]
__cpp_lib_ranges 202207L [C++20]
202406L [C++26]
__cpp_lib_raw_memory_algorithms 201606L [C++17]
__cpp_lib_shared_ptr_arrays 201611L [C++17]
201707L [C++20]
Expand Down Expand Up @@ -639,8 +638,8 @@
# ifndef __cpp_lib_ranges
# error "__cpp_lib_ranges should be defined in c++26"
# endif
# if __cpp_lib_ranges != 202406L
# error "__cpp_lib_ranges should have the value 202406L in c++26"
# if __cpp_lib_ranges != 202207L
# error "__cpp_lib_ranges should have the value 202207L in c++26"
# endif

# ifndef __cpp_lib_raw_memory_algorithms
Expand Down
5 changes: 2 additions & 3 deletions ...td/language.support/support.limits/support.limits.general/ranges.version.compile.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
/* Constant Value
__cpp_lib_default_template_type_for_algorithm_values 202403L [C++26]
__cpp_lib_ranges 202207L [C++20]
202406L [C++26]
__cpp_lib_ranges_as_const 202207L [C++23]
__cpp_lib_ranges_as_rvalue 202207L [C++23]
__cpp_lib_ranges_chunk 202202L [C++23]
Expand Down Expand Up @@ -365,8 +364,8 @@
# ifndef __cpp_lib_ranges
# error "__cpp_lib_ranges should be defined in c++26"
# endif
# if __cpp_lib_ranges != 202406L
# error "__cpp_lib_ranges should have the value 202406L in c++26"
# if __cpp_lib_ranges != 202207L
# error "__cpp_lib_ranges should have the value 202207L in c++26"
# endif

# if !defined(_LIBCPP_VERSION)
Expand Down
5 changes: 2 additions & 3 deletions ...d/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@
__cpp_lib_print 202207L [C++23]
__cpp_lib_quoted_string_io 201304L [C++14]
__cpp_lib_ranges 202207L [C++20]
202406L [C++26]
__cpp_lib_ranges_as_const 202207L [C++23]
__cpp_lib_ranges_as_rvalue 202207L [C++23]
__cpp_lib_ranges_chunk 202202L [C++23]
Expand Down Expand Up @@ -7457,8 +7456,8 @@
# ifndef __cpp_lib_ranges
# error "__cpp_lib_ranges should be defined in c++26"
# endif
# if __cpp_lib_ranges != 202406L
# error "__cpp_lib_ranges should have the value 202406L in c++26"
# if __cpp_lib_ranges != 202207L
# error "__cpp_lib_ranges should have the value 202207L in c++26"
# endif

# if !defined(_LIBCPP_VERSION)
Expand Down
3 changes: 2 additions & 1 deletion libcxx/utils/generate_feature_test_macro_components.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,8 @@ def add_version_header(tc):
"name": "__cpp_lib_ranges",
"values": {
"c++20": 202207,
"c++26": 202406, # P2997R1 Removing the common reference requirement from the indirectly invocable concepts
# "c++23": 202302, # Relaxing Ranges Just A Smidge
# "c++26": 202406, # P2997R1 Removing the common reference requirement from the indirectly invocable concepts
},
"headers": ["algorithm", "functional", "iterator", "memory", "ranges"],
},
Expand Down

0 comments on commit cbf570f

Please sign in to comment.