https://gcc.gnu.org/g:399ca300412970bcc11104d431d32770d0fc6c65
commit r14-11626-g399ca300412970bcc11104d431d32770d0fc6c65
Author: Michael Levine <mlevin...@bloomberg.net>
Date: Fri Jun 7 09:54:38 2024 +0100
libstdc++: Fix std::ranges::iota is not included in numeric [PR108760]
Before this patch, using std::ranges::iota required including
<algorithm> when it should have been sufficient to only include
<numeric>.
For the backport to the release branch ranges::iota is defined in
<bits/ranges_algobase.h> so that it's available in both <numeric> and
<algorithm>. This avoids breaking code that compiles successfully using
existing releases where <algorithm> defines ranges::iota.
libstdc++-v3/ChangeLog:
PR libstdc++/108760
* include/bits/ranges_algo.h (ranges::out_value_result)
(ranges::iota_result, ranges::__iota_fn, ranges::iota): Move to
<bits/ranges_algobase.h>.
* include/bits/ranges_algobase.h (ranges::out_value_result):
(ranges::iota_result, ranges::__iota_fn, ranges::iota): Move to
here.
* include/std/numeric: Include <bits/ranges_algobase.h>.
* testsuite/25_algorithms/iota/1.cc: Renamed to ...
* testsuite/26_numerics/iota/2.cc: ... here.
Signed-off-by: Michael Levine <mlevin...@bloomberg.net>
(cherry picked from commit 0bb1db32ccf54a9de59bea718f7575f7ef22abf5)
Diff:
---
libstdc++-v3/include/bits/ranges_algo.h | 52 ----------------------
libstdc++-v3/include/bits/ranges_algobase.h | 50 +++++++++++++++++++++
libstdc++-v3/include/std/numeric | 4 ++
.../iota/1.cc => 26_numerics/iota/2.cc} | 1 -
4 files changed, 54 insertions(+), 53 deletions(-)
diff --git a/libstdc++-v3/include/bits/ranges_algo.h
b/libstdc++-v3/include/bits/ranges_algo.h
index 6bac65bc564d..59374e3dbd0c 100644
--- a/libstdc++-v3/include/bits/ranges_algo.h
+++ b/libstdc++-v3/include/bits/ranges_algo.h
@@ -3535,58 +3535,6 @@ namespace ranges
#endif // __glibcxx_ranges_contains
-#if __glibcxx_ranges_iota >= 202202L // C++ >= 23
-
- template<typename _Out, typename _Tp>
- struct out_value_result
- {
- [[no_unique_address]] _Out out;
- [[no_unique_address]] _Tp value;
-
- template<typename _Out2, typename _Tp2>
- requires convertible_to<const _Out&, _Out2>
- && convertible_to<const _Tp&, _Tp2>
- constexpr
- operator out_value_result<_Out2, _Tp2>() const &
- { return {out, value}; }
-
- template<typename _Out2, typename _Tp2>
- requires convertible_to<_Out, _Out2>
- && convertible_to<_Tp, _Tp2>
- constexpr
- operator out_value_result<_Out2, _Tp2>() &&
- { return {std::move(out), std::move(value)}; }
- };
-
- template<typename _Out, typename _Tp>
- using iota_result = out_value_result<_Out, _Tp>;
-
- struct __iota_fn
- {
- template<input_or_output_iterator _Out, sentinel_for<_Out> _Sent,
weakly_incrementable _Tp>
- requires indirectly_writable<_Out, const _Tp&>
- constexpr iota_result<_Out, _Tp>
- operator()(_Out __first, _Sent __last, _Tp __value) const
- {
- while (__first != __last)
- {
- *__first = static_cast<const _Tp&>(__value);
- ++__first;
- ++__value;
- }
- return {std::move(__first), std::move(__value)};
- }
-
- template<weakly_incrementable _Tp, output_range<const _Tp&> _Range>
- constexpr iota_result<borrowed_iterator_t<_Range>, _Tp>
- operator()(_Range&& __r, _Tp __value) const
- { return (*this)(ranges::begin(__r), ranges::end(__r),
std::move(__value)); }
- };
-
- inline constexpr __iota_fn iota{};
-
-#endif // __glibcxx_ranges_iota
-
#if __glibcxx_ranges_find_last >= 202207L // C++ >= 23
struct __find_last_fn
diff --git a/libstdc++-v3/include/bits/ranges_algobase.h
b/libstdc++-v3/include/bits/ranges_algobase.h
index a013de40318e..40f5bb707e00 100644
--- a/libstdc++-v3/include/bits/ranges_algobase.h
+++ b/libstdc++-v3/include/bits/ranges_algobase.h
@@ -71,6 +71,56 @@ namespace ranges
__is_move_iterator<move_iterator<_Iterator>> = true;
} // namespace __detail
+#if __glibcxx_ranges_iota >= 202202L // C++ >= 23
+ template<typename _Out, typename _Tp>
+ struct out_value_result
+ {
+ [[no_unique_address]] _Out out;
+ [[no_unique_address]] _Tp value;
+
+ template<typename _Out2, typename _Tp2>
+ requires convertible_to<const _Out&, _Out2>
+ && convertible_to<const _Tp&, _Tp2>
+ constexpr
+ operator out_value_result<_Out2, _Tp2>() const &
+ { return {out, value}; }
+
+ template<typename _Out2, typename _Tp2>
+ requires convertible_to<_Out, _Out2>
+ && convertible_to<_Tp, _Tp2>
+ constexpr
+ operator out_value_result<_Out2, _Tp2>() &&
+ { return {std::move(out), std::move(value)}; }
+ };
+
+ template<typename _Out, typename _Tp>
+ using iota_result = out_value_result<_Out, _Tp>;
+
+ struct __iota_fn
+ {
+ template<input_or_output_iterator _Out, sentinel_for<_Out> _Sent,
weakly_incrementable _Tp>
+ requires indirectly_writable<_Out, const _Tp&>
+ constexpr iota_result<_Out, _Tp>
+ operator()(_Out __first, _Sent __last, _Tp __value) const
+ {
+ while (__first != __last)
+ {
+ *__first = static_cast<const _Tp&>(__value);
+ ++__first;
+ ++__value;
+ }
+ return {std::move(__first), std::move(__value)};
+ }
+
+ template<weakly_incrementable _Tp, output_range<const _Tp&> _Range>
+ constexpr iota_result<borrowed_iterator_t<_Range>, _Tp>
+ operator()(_Range&& __r, _Tp __value) const
+ { return (*this)(ranges::begin(__r), ranges::end(__r),
std::move(__value)); }
+ };
+
+ inline constexpr __iota_fn iota{};
+#endif // __glibcxx_ranges_iota
+
struct __equal_fn
{
template<input_iterator _Iter1, sentinel_for<_Iter1> _Sent1,
diff --git a/libstdc++-v3/include/std/numeric b/libstdc++-v3/include/std/numeric
index a4cda3d5c36f..ab6ae22609ba 100644
--- a/libstdc++-v3/include/std/numeric
+++ b/libstdc++-v3/include/std/numeric
@@ -89,6 +89,10 @@
#define __glibcxx_want_saturation_arithmetic
#include <bits/version.h>
+#if __glibcxx_ranges_iota >= 202202L // C++ >= 23
+# include <bits/ranges_algobase.h> // for ranges::out_value_result,
ranges::iota
+#endif
+
#ifdef __glibcxx_saturation_arithmetic // C++ >= 26
# include <bits/sat_arith.h>
#endif
diff --git a/libstdc++-v3/testsuite/25_algorithms/iota/1.cc
b/libstdc++-v3/testsuite/26_numerics/iota/2.cc
similarity index 96%
rename from libstdc++-v3/testsuite/25_algorithms/iota/1.cc
rename to libstdc++-v3/testsuite/26_numerics/iota/2.cc
index ebadeee79a13..b14580b8be19 100644
--- a/libstdc++-v3/testsuite/25_algorithms/iota/1.cc
+++ b/libstdc++-v3/testsuite/26_numerics/iota/2.cc
@@ -1,6 +1,5 @@
// { dg-do run { target c++23 } }
-#include <algorithm>
#include <numeric>
#include <testsuite_hooks.h>
#include <testsuite_iterators.h>
