diff --git a/libstdc++-v3/include/bits/ranges_algo.h b/libstdc++-v3/include/bits/ranges_algo.h index f041ff16b0e4aec364b7dd7dd79ea0127fa6f876..410d3ae1dd8210460fdfa24d59762abfcd5116ac 100644 --- a/libstdc++-v3/include/bits/ranges_algo.h +++ b/libstdc++-v3/include/bits/ranges_algo.h @@ -3468,6 +3468,9 @@ namespace ranges inline constexpr __prev_permutation_fn prev_permutation{}; #if __cplusplus > 202002L + +#define __cpp_lib_ranges_contains 202207L + struct __contains_fn { template<input_iterator _Iter, sentinel_for<_Iter> _Sent, @@ -3521,6 +3524,8 @@ namespace ranges inline constexpr __contains_subrange_fn contains_subrange{}; +#define __cpp_lib_ranges_iota 202202L + template<typename _Out, typename _Tp> struct out_value_result { @@ -3569,6 +3574,8 @@ namespace ranges inline constexpr __iota_fn iota{}; +#define __cpp_lib_ranges_find_last 202207L + struct __find_last_fn { template<forward_iterator _Iter, sentinel_for<_Iter> _Sent, typename _Tp, typename _Proj = identity> @@ -3695,7 +3702,7 @@ namespace ranges inline constexpr __find_last_if_not_fn find_last_if_not{}; -#define __cpp_lib_fold 202207L +#define __cpp_lib_ranges_fold 202207L template<typename _Iter, typename _Tp> struct in_value_result diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 9f31f25f1e9c62d597e6e2a0f1f9eb03ed573178..027e5711ec5911fbc9745364e8c10b428cd1615c 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -341,7 +341,10 @@ #define __cpp_lib_ranges_as_rvalue 202207L #define __cpp_lib_ranges_as_const 202207L #define __cpp_lib_ranges_enumerate 202302L -#define __cpp_lib_fold 202207L +#define __cpp_lib_ranges_contains 202207L +#define __cpp_lib_ranges_iota 202202L +#define __cpp_lib_ranges_find_last 202207L +#define __cpp_lib_ranges_fold 202207L #if __cpp_constexpr_dynamic_alloc # if _GLIBCXX_HOSTED # define __cpp_lib_constexpr_bitset 202202L diff --git a/libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc b/libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc index 5cc91b67d27dbb523692d9a9bc861b7551ebe0f6..4041d13315f423ef5845a79401c1bb3ce5e4906a 100644 --- a/libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc +++ b/libstdc++-v3/testsuite/25_algorithms/fold_left/1.cc @@ -5,8 +5,8 @@ #include <ranges> #include <testsuite_iterators.h> -#if __cpp_lib_fold != 202207L -# error "Feature-test macro __cpp_lib_fold has wrong value in <algorithm>" +#if __cpp_lib_ranges_fold != 202207L +# error "Feature-test macro __cpp_lib_ranges_fold has wrong value in <algorithm>" #endif namespace ranges = std::ranges; diff --git a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc index e2c14edc8ef316a4d9f3d86f0d0fcd12de12ec8d..04609bb602c9b674cc5935d4742e8f29e9de0402 100644 --- a/libstdc++-v3/testsuite/std/ranges/version_c++23.cc +++ b/libstdc++-v3/testsuite/std/ranges/version_c++23.cc @@ -52,3 +52,19 @@ #if __cpp_lib_ranges_enumerate != 202302L # error "Feature-test macro __cpp_lib_ranges_enumerate has wrong value in <version>" #endif + +#if __cpp_lib_ranges_contains != 202207L +# error "Feature-test macro __cpp_lib_ranges_contains has wrong value in <version>" +#endif + +#if __cpp_lib_ranges_iota != 202202L +# error "Feature-test macro __cpp_lib_ranges_iota has wrong value in <version>" +#endif + +#if __cpp_lib_ranges_find_last != 202207L +# error "Feature-test macro __cpp_lib_ranges_find_last has wrong value in <version>" +#endif + +#if __cpp_lib_ranges_fold != 202207L +# error "Feature-test macro __cpp_lib_ranges_fold has wrong value in <version>" +#endif