diff mbox series

libstdc++: Implement LWG 3580 changes to ranges::iota_view

Message ID 20211019182947.1694133-1-ppalka@redhat.com
State Committed
Commit 5566f3c6b46cf053ae4b918513e318561b7af053
Delegated to: Jonathan Wakely
Headers
Series libstdc++: Implement LWG 3580 changes to ranges::iota_view |

Commit Message

Patrick Palka Oct. 19, 2021, 6:29 p.m. UTC 
  Tested on x86_64-pc-linux-gnu, does this look OK for trunk and branches?

libstdc++-v3/ChangeLog:

	* include/std/ranges (iota_view::operator+): Adjust definition
	as per LWG 3580.
	(iota_view::operator-): Likewise.
---
 libstdc++-v3/include/std/ranges | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Comments

Jonathan Wakely Oct. 19, 2021, 6:47 p.m. UTC | #1 
On Tue, 19 Oct 2021, 19:33 Patrick Palka via Libstdc++, <
libstdc++@gcc.gnu.org> wrote:

> Tested on x86_64-pc-linux-gnu, does this look OK for trunk and branches?
>


Yes, thanks.



> libstdc++-v3/ChangeLog:
>
>         * include/std/ranges (iota_view::operator+): Adjust definition
>         as per LWG 3580.
>         (iota_view::operator-): Likewise.
> ---
>  libstdc++-v3/include/std/ranges | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/libstdc++-v3/include/std/ranges
> b/libstdc++-v3/include/std/ranges
> index 18bd087985c..5e18c98eb2f 100644
> --- a/libstdc++-v3/include/std/ranges
> +++ b/libstdc++-v3/include/std/ranges
> @@ -497,7 +497,10 @@ namespace ranges
>         friend constexpr _Iterator
>         operator+(_Iterator __i, difference_type __n)
>           requires __detail::__advanceable<_Winc>
> -       { return __i += __n; }
> +       {
> +         __i += __n;
> +         return __i;
> +       }
>
>         friend constexpr _Iterator
>         operator+(difference_type __n, _Iterator __i)
> @@ -507,7 +510,10 @@ namespace ranges
>         friend constexpr _Iterator
>         operator-(_Iterator __i, difference_type __n)
>           requires __detail::__advanceable<_Winc>
> -       { return __i -= __n; }
> +       {
> +         __i -= __n;
> +         return __i;
> +       }
>
>         friend constexpr difference_type
>         operator-(const _Iterator& __x, const _Iterator& __y)
> --
> 2.33.1.711.g9d530dc002
>
>
diff mbox series

Patch

diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index 18bd087985c..5e18c98eb2f 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -497,7 +497,10 @@  namespace ranges
 	friend constexpr _Iterator
 	operator+(_Iterator __i, difference_type __n)
 	  requires __detail::__advanceable<_Winc>
-	{ return __i += __n; }
+	{
+	  __i += __n;
+	  return __i;
+	}
 
 	friend constexpr _Iterator
 	operator+(difference_type __n, _Iterator __i)
@@ -507,7 +510,10 @@  namespace ranges
 	friend constexpr _Iterator
 	operator-(_Iterator __i, difference_type __n)
 	  requires __detail::__advanceable<_Winc>
-	{ return __i -= __n; }
+	{
+	  __i -= __n;
+	  return __i;
+	}
 
 	friend constexpr difference_type
 	operator-(const _Iterator& __x, const _Iterator& __y)