Skip to content

<ranges>: Explicitly specify the template parameters for tuple #3609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stephan T. Lavavej (StephanTLavavej) merged 1 commit into from
Apr 7, 2023
Merged

<ranges>: Explicitly specify the template parameters for tuple #3609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions stl/inc/ranges
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9849,7 +9849,8 @@ namespace ranges {

template <size_t... _Indices>
_NODISCARD constexpr auto _End_tuple(index_sequence<_Indices...>) const {
return tuple{_RANGES end(_STD get<0>(_Parent->_Bases)),
return tuple<sentinel_t<_Maybe_const<_Const, _First>>, iterator_t<_Maybe_const<_Const, _Rest>>...>{
_RANGES end(_STD get<0>(_Parent->_Bases)),
_RANGES begin(_STD get<_Indices + 1>(_Parent->_Bases))...};
}

Expand Down Expand Up @@ -10089,7 +10090,7 @@ namespace ranges {
(make_index_sequence<sizeof...(_Rest)>{});

const auto _Make_iter_tuple = [&]<size_t... _Indices>(index_sequence<_Indices...>) {
return tuple{_Begin_or_first_end<_Indices>(_Is_empty)...};
return tuple<iterator_t<_First>, iterator_t<_Rest>...>{_Begin_or_first_end<_Indices>(_Is_empty)...};
};
return _Iterator<false>{*this, _Make_iter_tuple(make_index_sequence<1 + sizeof...(_Rest)>{})};
}
Expand All @@ -10103,7 +10104,8 @@ namespace ranges {
(make_index_sequence<sizeof...(_Rest)>{});

const auto _Make_iter_tuple = [&]<size_t... _Indices>(index_sequence<_Indices...>) {
return tuple{_Begin_or_first_end<_Indices>(_Is_empty)...};
return tuple<iterator_t<const _First>, iterator_t<const _Rest>...>{
_Begin_or_first_end<_Indices>(_Is_empty)...};
};
return _Iterator<true>{*this, _Make_iter_tuple(make_index_sequence<1 + sizeof...(_Rest)>{})};
}
Expand Down