Skip to content

Rename _Iterator_base to _Category_base in <ranges> #1420

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
StephanTLavavej merged 1 commit into from
Nov 7, 2020
Merged

Rename _Iterator_base to _Category_base in <ranges> #1420

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
18 changes: 8 additions & 10 deletions stl/inc/ranges
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,11 +857,10 @@ namespace ranges {
/* [[no_unique_address]] */ _Semiregular_box<_Pr> _Pred{};

template <class _Traits> // TRANSITION, LWG-3289
struct _Iterator_base {};
struct _Category_base {};
// clang-format off
template <class _Traits>
requires _Has_member_iterator_category<_Traits>
struct _Iterator_base<_Traits> {
template <_Has_member_iterator_category _Traits>
struct _Category_base<_Traits> {
// clang-format on
using iterator_category =
conditional_t<derived_from<typename _Traits::iterator_category, bidirectional_iterator_tag>,
Expand All @@ -870,7 +869,7 @@ namespace ranges {
forward_iterator_tag, input_iterator_tag>>;
};

class _Iterator : public _Iterator_base<iterator_traits<iterator_t<_Vw>>> {
class _Iterator : public _Category_base<iterator_traits<iterator_t<_Vw>>> {
private:
/* [[no_unique_address]] */ iterator_t<_Vw> _Current{};
filter_view* _Parent{};
Expand Down Expand Up @@ -1137,11 +1136,10 @@ namespace ranges {
class _Sentinel;

template <class _Traits, class _Base> // TRANSITION, LWG-3289
struct _Iterator_base {};
struct _Category_base {};
// clang-format off
template <class _Traits, class _Base>
requires _Has_member_iterator_category<_Traits>
struct _Iterator_base<_Traits, _Base> {
template <_Has_member_iterator_category _Traits, class _Base>
struct _Category_base<_Traits, _Base> {
// clang-format on
using iterator_category =
conditional_t<is_lvalue_reference_v<invoke_result_t<_Fn&, range_reference_t<_Base>>>,
Expand All @@ -1151,7 +1149,7 @@ namespace ranges {
};

template <bool _Const>
class _Iterator : public _Iterator_base<iterator_traits<iterator_t<_Vw>>, _Maybe_const<_Const, _Vw>> {
class _Iterator : public _Category_base<iterator_traits<iterator_t<_Vw>>, _Maybe_const<_Const, _Vw>> {
private:
template <bool>
friend class _Iterator;
Expand Down