diff --git a/stl/inc/ranges b/stl/inc/ranges index 9e54f51b2cb..78a41f6d077 100644 --- a/stl/inc/ranges +++ b/stl/inc/ranges @@ -857,11 +857,10 @@ namespace ranges { /* [[no_unique_address]] */ _Semiregular_box<_Pr> _Pred{}; template // TRANSITION, LWG-3289 - struct _Iterator_base {}; + struct _Category_base {}; // clang-format off - template - 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, @@ -870,7 +869,7 @@ namespace ranges { forward_iterator_tag, input_iterator_tag>>; }; - class _Iterator : public _Iterator_base>> { + class _Iterator : public _Category_base>> { private: /* [[no_unique_address]] */ iterator_t<_Vw> _Current{}; filter_view* _Parent{}; @@ -1137,11 +1136,10 @@ namespace ranges { class _Sentinel; template // TRANSITION, LWG-3289 - struct _Iterator_base {}; + struct _Category_base {}; // clang-format off - template - 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>>, @@ -1151,7 +1149,7 @@ namespace ranges { }; template - class _Iterator : public _Iterator_base>, _Maybe_const<_Const, _Vw>> { + class _Iterator : public _Category_base>, _Maybe_const<_Const, _Vw>> { private: template friend class _Iterator;