|
5676 | 5676 | \begin{itemize}
|
5677 | 5677 | \item
|
5678 | 5678 | If \tcode{T} is a specialization
|
5679 |
| -of \tcode{ranges::empty_view}\iref{range.empty.view}, |
| 5679 | +of \tcode{empty_view}\iref{range.empty.view}, |
5680 | 5680 | then \tcode{((void)F, \placeholdernc{decay-copy}(E))},
|
5681 | 5681 | except that the evaluations of \tcode{E} and \tcode{F}
|
5682 | 5682 | are indeterminately sequenced.
|
|
5687 | 5687 | and is a specialization of
|
5688 | 5688 | \tcode{span}\iref{views.span},
|
5689 | 5689 | \tcode{basic_string_view}\iref{string.view}, or
|
5690 |
| -\tcode{ranges::subrange}\iref{range.subrange}, |
| 5690 | +\tcode{subrange}\iref{range.subrange}, |
5691 | 5691 | then
|
5692 | 5692 | \tcode{U(ranges::begin(E),
|
5693 | 5693 | ranges::be\-gin(E) + std::min<D>(ranges::distance(E), F))},
|
|
5699 | 5699 | then \tcode{U} is \tcode{span<typename T::element_type>};
|
5700 | 5700 | \item otherwise, if \tcode{T} is a specialization of \tcode{basic_string_view},
|
5701 | 5701 | then \tcode{U} is \tcode{T};
|
5702 |
| -\item otherwise, \tcode{T} is a specialization of \tcode{ranges::subrange}, and |
5703 |
| -\tcode{U} is \tcode{ranges::subrange<iterator_t<T>>}; |
| 5702 | +\item otherwise, \tcode{T} is a specialization of \tcode{subrange}, and |
| 5703 | +\tcode{U} is \tcode{subrange<iterator_t<T>>}; |
5704 | 5704 | \end{itemize}
|
5705 | 5705 |
|
5706 | 5706 | \item
|
5707 | 5707 | otherwise, if \tcode{T} is
|
5708 |
| -a specialization of \tcode{ranges::iota_view}\iref{range.iota.view} |
| 5708 | +a specialization of \tcode{iota_view}\iref{range.iota.view} |
5709 | 5709 | that models \libconcept{random_access_range} and \libconcept{sized_range},
|
5710 | 5710 | then
|
5711 |
| -\tcode{ranges::iota_view(*ranges::begin(E), |
| 5711 | +\tcode{iota_view(*ranges::begin(E), |
5712 | 5712 | *(ranges::begin(E) + std::\linebreak{}min<D>(ranges::distance(E), F)))},
|
5713 | 5713 | except that \tcode{E} is evaluated only once.
|
5714 | 5714 |
|
5715 | 5715 | \item
|
5716 | 5716 | Otherwise, if \tcode{T} is
|
5717 |
| -a specialization of \tcode{ranges::repeat_view}\iref{range.repeat.view}: |
| 5717 | +a specialization of \tcode{repeat_view}\iref{range.repeat.view}: |
5718 | 5718 | \begin{itemize}
|
5719 | 5719 | \item
|
5720 | 5720 | if \tcode{T} models \libconcept{sized_range},
|
|
5728 | 5728 | \end{itemize}
|
5729 | 5729 |
|
5730 | 5730 | \item
|
5731 |
| -Otherwise, \tcode{ranges::take_view(E, F)}. |
| 5731 | +Otherwise, \tcode{take_view(E, F)}. |
5732 | 5732 | \end{itemize}
|
5733 | 5733 |
|
5734 | 5734 | \pnum
|
|
6141 | 6141 | \begin{itemize}
|
6142 | 6142 | \item
|
6143 | 6143 | If \tcode{T} is a specialization of
|
6144 |
| -\tcode{ranges::empty_view}\iref{range.empty.view}, |
| 6144 | +\tcode{empty_view}\iref{range.empty.view}, |
6145 | 6145 | then \tcode{((void)F, \placeholdernc{decay-copy}(E))},
|
6146 | 6146 | except that the evaluations of \tcode{E} and \tcode{F}
|
6147 | 6147 | are indeterminately sequenced.
|
|
6153 | 6153 | \begin{itemize}
|
6154 | 6154 | \item a specialization of \tcode{span}\iref{views.span},
|
6155 | 6155 | \item a specialization of \tcode{basic_string_view}\iref{string.view},
|
6156 |
| -\item a specialization of \tcode{ranges::iota_view}\iref{range.iota.view}, or |
6157 |
| -\item a specialization of \tcode{ranges::subrange}\iref{range.subrange} |
| 6156 | +\item a specialization of \tcode{iota_view}\iref{range.iota.view}, or |
| 6157 | +\item a specialization of \tcode{subrange}\iref{range.subrange} |
6158 | 6158 | where \tcode{T::\exposid{StoreSize}} is \tcode{false},
|
6159 | 6159 | \end{itemize}
|
6160 | 6160 | then \tcode{U(ranges::begin(E) + std::min<D>(ranges::distance(E), F), ranges::end(E))},
|
|
6165 | 6165 | \item
|
6166 | 6166 | Otherwise,
|
6167 | 6167 | if \tcode{T} is
|
6168 |
| -a specialization of \tcode{ranges::subrange}\iref{range.subrange} |
| 6168 | +a specialization of \tcode{subrange}\iref{range.subrange} |
6169 | 6169 | that models \libconcept{random_access_range} and \libconcept{sized_range},
|
6170 | 6170 | then
|
6171 | 6171 | \tcode{T(ranges::begin(E) + std::min<D>(ranges::distance(E), F), ranges::\linebreak{}end(E),
|
|
6175 | 6175 |
|
6176 | 6176 | \item
|
6177 | 6177 | Otherwise, if \tcode{T} is
|
6178 |
| -a specialization of \tcode{ranges::repeat_view}\iref{range.repeat.view}: |
| 6178 | +a specialization of \tcode{repeat_view}\iref{range.repeat.view}: |
6179 | 6179 | \begin{itemize}
|
6180 | 6180 | \item
|
6181 | 6181 | if \tcode{T} models \libconcept{sized_range},
|
|
6190 | 6190 | \end{itemize}
|
6191 | 6191 |
|
6192 | 6192 | \item
|
6193 |
| -Otherwise, \tcode{ranges::drop_view(E, F)}. |
| 6193 | +Otherwise, \tcode{drop_view(E, F)}. |
6194 | 6194 | \end{itemize}
|
6195 | 6195 |
|
6196 | 6196 | \pnum
|
|
0 commit comments