Skip to content

Commit e02aa79

Browse files
jensmaurerzygoloid
authored andcommitted
Various small fixes relative to the ingress paper
[range.istream.view] Do not repeat declaration of function istream_view [range.elements.iterator] Renamed from [range.elements_view.iterator] [range.elements.iterator] Use local typedef difference_type [range.elements.iterator] Use reference return type for compound assignment
1 parent 2c27a4b commit e02aa79

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

source/ranges.tex

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5509,9 +5509,6 @@
55095509
basic_istream<CharT, Traits>* stream_{}; // \expos
55105510
Val object_ = Val(); // \expos
55115511
};
5512-
5513-
template<class Val, class CharT, class Traits>
5514-
basic_istream_view<Val, CharT, Traits> istream_view(basic_istream<CharT, Traits>& s);
55155512
}
55165513
\end{codeblock}
55175514

@@ -5775,7 +5772,7 @@
57755772
Equivalent to: \tcode{return base_;}
57765773
\end{itemdescr}
57775774

5778-
\rSec3[range.elements_view.iterator]{Class template \tcode{elements_view::iterator}}
5775+
\rSec3[range.elements.iterator]{Class template \tcode{elements_view::iterator}}
57795776

57805777
\begin{codeblock}
57815778
namespace std::ranges {
@@ -5842,10 +5839,10 @@
58425839
constexpr friend difference_type operator-(const iterator& x, const iterator& y)
58435840
requires RandomAccessRange<base_t>;
58445841

5845-
constexpr friend range_difference_t<base_t>
5842+
constexpr friend difference_type
58465843
operator-(const iterator<Const>& x, const sentinel_t<base_t>& y)
58475844
requires SizedSentinel<sentinel_t<base_t>, iterator_t<base_t>>;
5848-
constexpr friend range_difference_t<base_t>
5845+
constexpr friend difference_type
58495846
operator-(const sentinel_t<base_t>& x, const iterator<Const>& y)
58505847
requires SizedSentinel<sentinel_t<base_t>, iterator_t<base_t>>;
58515848
};
@@ -5950,7 +5947,7 @@
59505947
\end{itemdescr}
59515948

59525949
\begin{itemdecl}
5953-
constexpr iterator operator+=(difference_type n);
5950+
constexpr iterator& operator+=(difference_type n);
59545951
requires RandomAccessRange<base_t>;
59555952
\end{itemdecl}
59565953

@@ -5965,7 +5962,7 @@
59655962
\end{itemdescr}
59665963

59675964
\begin{itemdecl}
5968-
constexpr iterator operator-=(difference_type n)
5965+
constexpr iterator& operator-=(difference_type n)
59695966
requires RandomAccessRange<base_t>;
59705967
\end{itemdecl}
59715968

@@ -6099,19 +6096,19 @@
60996096
\end{itemdescr}
61006097

61016098
\begin{itemdecl}
6102-
constexpr friend range_difference_t<base_t>
6099+
constexpr friend difference_type
61036100
operator-(const iterator<Const>& x, const sentinel_t<base_t>& y)
61046101
requires SizedSentinel<sentinel_t<base_t>, iterator_t<base_t>>;
61056102
\end{itemdecl}
61066103

61076104
\begin{itemdescr}
61086105
\pnum
61096106
\effects
6110-
Equivalent to: \tcode{return x.current_ - y};
6107+
Equivalent to: \tcode{return x.current_ - y;}
61116108
\end{itemdescr}
61126109

61136110
\begin{itemdecl}
6114-
constexpr friend range_difference_t<base_t>
6111+
constexpr friend difference_type
61156112
operator-(const sentinel_t<base_t>& x, const iterator<Const>& y)
61166113
requires SizedSentinel<sentinel_t<base_t>, iterator_t<base_t>>;
61176114
\end{itemdecl}

0 commit comments

Comments
 (0)