|
5509 | 5509 | basic_istream<CharT, Traits>* stream_{}; // \expos
|
5510 | 5510 | Val object_ = Val(); // \expos
|
5511 | 5511 | };
|
5512 |
| - |
5513 |
| - template<class Val, class CharT, class Traits> |
5514 |
| - basic_istream_view<Val, CharT, Traits> istream_view(basic_istream<CharT, Traits>& s); |
5515 | 5512 | }
|
5516 | 5513 | \end{codeblock}
|
5517 | 5514 |
|
|
5775 | 5772 | Equivalent to: \tcode{return base_;}
|
5776 | 5773 | \end{itemdescr}
|
5777 | 5774 |
|
5778 |
| -\rSec3[range.elements_view.iterator]{Class template \tcode{elements_view::iterator}} |
| 5775 | +\rSec3[range.elements.iterator]{Class template \tcode{elements_view::iterator}} |
5779 | 5776 |
|
5780 | 5777 | \begin{codeblock}
|
5781 | 5778 | namespace std::ranges {
|
|
5842 | 5839 | constexpr friend difference_type operator-(const iterator& x, const iterator& y)
|
5843 | 5840 | requires RandomAccessRange<base_t>;
|
5844 | 5841 |
|
5845 |
| - constexpr friend range_difference_t<base_t> |
| 5842 | + constexpr friend difference_type |
5846 | 5843 | operator-(const iterator<Const>& x, const sentinel_t<base_t>& y)
|
5847 | 5844 | requires SizedSentinel<sentinel_t<base_t>, iterator_t<base_t>>;
|
5848 |
| - constexpr friend range_difference_t<base_t> |
| 5845 | + constexpr friend difference_type |
5849 | 5846 | operator-(const sentinel_t<base_t>& x, const iterator<Const>& y)
|
5850 | 5847 | requires SizedSentinel<sentinel_t<base_t>, iterator_t<base_t>>;
|
5851 | 5848 | };
|
|
5950 | 5947 | \end{itemdescr}
|
5951 | 5948 |
|
5952 | 5949 | \begin{itemdecl}
|
5953 |
| -constexpr iterator operator+=(difference_type n); |
| 5950 | +constexpr iterator& operator+=(difference_type n); |
5954 | 5951 | requires RandomAccessRange<base_t>;
|
5955 | 5952 | \end{itemdecl}
|
5956 | 5953 |
|
|
5965 | 5962 | \end{itemdescr}
|
5966 | 5963 |
|
5967 | 5964 | \begin{itemdecl}
|
5968 |
| -constexpr iterator operator-=(difference_type n) |
| 5965 | +constexpr iterator& operator-=(difference_type n) |
5969 | 5966 | requires RandomAccessRange<base_t>;
|
5970 | 5967 | \end{itemdecl}
|
5971 | 5968 |
|
|
6099 | 6096 | \end{itemdescr}
|
6100 | 6097 |
|
6101 | 6098 | \begin{itemdecl}
|
6102 |
| -constexpr friend range_difference_t<base_t> |
| 6099 | +constexpr friend difference_type |
6103 | 6100 | operator-(const iterator<Const>& x, const sentinel_t<base_t>& y)
|
6104 | 6101 | requires SizedSentinel<sentinel_t<base_t>, iterator_t<base_t>>;
|
6105 | 6102 | \end{itemdecl}
|
6106 | 6103 |
|
6107 | 6104 | \begin{itemdescr}
|
6108 | 6105 | \pnum
|
6109 | 6106 | \effects
|
6110 |
| -Equivalent to: \tcode{return x.current_ - y}; |
| 6107 | +Equivalent to: \tcode{return x.current_ - y;} |
6111 | 6108 | \end{itemdescr}
|
6112 | 6109 |
|
6113 | 6110 | \begin{itemdecl}
|
6114 |
| -constexpr friend range_difference_t<base_t> |
| 6111 | +constexpr friend difference_type |
6115 | 6112 | operator-(const sentinel_t<base_t>& x, const iterator<Const>& y)
|
6116 | 6113 | requires SizedSentinel<sentinel_t<base_t>, iterator_t<base_t>>;
|
6117 | 6114 | \end{itemdecl}
|
|
0 commit comments