Re: [PATCH 4/3] Add [range.istream]

[Jonathan Wakely]

On 07/02/20 09:46 -0500, Patrick Palka wrote:

Fixed and committed with that change.  Thanks for the review!

I've just tested and pushed this fix.


commit 572992c8920d5339a3ac28d442c436d6daa0bfae
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Fri Feb 7 16:06:43 2020 +0000

    libstdc++ Fix missing return in istream_view iterator
    
            * include/std/ranges (iota_view): Add braces to prevent -Wempty-body
            warning.
            (basic_istream_view::_Iterator::operator++()): Add missing return.

diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges
index dd0c5cf6aa7..891ecf75eff 100644
--- a/libstdc++-v3/include/std/ranges
+++ b/libstdc++-v3/include/std/ranges
@@ -872,7 +872,9 @@ namespace ranges
       : _M_value(__value), _M_bound(__bound)
       {
 	if constexpr (totally_ordered_with<_Winc, _Bound>)
-	  __glibcxx_assert( bool(__value <= __bound) );
+	  {
+	    __glibcxx_assert( bool(__value <= __bound) );
+	  }
       }
 
       constexpr _Iterator
@@ -1012,6 +1014,7 @@ namespace views
 	{
 	  __glibcxx_assert(_M_parent->_M_stream != nullptr);
 	  *_M_parent->_M_stream >> _M_parent->_M_object;
+	  return *this;
 	}
 
 	void