Skip to content
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

Jump to bottom

Remove redundant template parameters for _XX_iter_types #3765

Merged
merged 11 commits into from
Jun 15, 2023
Merged

Remove redundant template parameters for _XX_iter_types #3765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b5c3952
for forward_list
achabense Jun 12, 2023
b1ca3f2
for xstring
achabense Jun 12, 2023
5b203d8
for list
achabense Jun 12, 2023
a4572ed
for deque
achabense Jun 12, 2023
93308d3
for xtree
achabense Jun 12, 2023
345e82e
for vector 0
achabense Jun 12, 2023
1b717c0
for vector 1
achabense Jun 12, 2023
f74c10d
format 0
achabense Jun 12, 2023
4c72faf
format 1
achabense Jun 12, 2023
5a52c1e
format 2
achabense Jun 12, 2023
59c6ca4
format 3
achabense Jun 12, 2023
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
4 changes: 2 additions & 2 deletions stl/inc/deque
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ public:
};

template <class _Value_type, class _Size_type, class _Difference_type, class _Pointer, class _Const_pointer,
class _Reference, class _Const_reference, class _Mapptr_type>
class _Mapptr_type>
struct _Deque_iter_types {
using value_type = _Value_type;
using size_type = _Size_type;
Expand Down Expand Up @@ -587,7 +587,7 @@ private:

using _Scary_val = _Deque_val<conditional_t<_Is_simple_alloc_v<_Alty>, _Deque_simple_types<_Ty>,
_Deque_iter_types<_Ty, typename _Alty_traits::size_type, typename _Alty_traits::difference_type,
typename _Alty_traits::pointer, typename _Alty_traits::const_pointer, _Ty&, const _Ty&, _Mapptr>>>;
typename _Alty_traits::pointer, typename _Alty_traits::const_pointer, _Mapptr>>>;

static constexpr int _Minimum_map_size = 8;
static constexpr int _Block_size = _Scary_val::_Block_size;
Expand Down
4 changes: 2 additions & 2 deletions stl/inc/forward_list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public:
};

template <class _Value_type, class _Size_type, class _Difference_type, class _Pointer, class _Const_pointer,
class _Reference, class _Const_reference, class _Nodeptr_type>
class _Nodeptr_type>
struct _Flist_iter_types {
using value_type = _Value_type;
using size_type = _Size_type;
Expand Down Expand Up @@ -524,7 +524,7 @@ private:

using _Scary_val = _Flist_val<conditional_t<_Is_simple_alloc_v<_Alnode>, _Flist_simple_types<_Ty>,
_Flist_iter_types<_Ty, typename _Alty_traits::size_type, typename _Alty_traits::difference_type,
typename _Alty_traits::pointer, typename _Alty_traits::const_pointer, _Ty&, const _Ty&, _Nodeptr>>>;
typename _Alty_traits::pointer, typename _Alty_traits::const_pointer, _Nodeptr>>>;

public:
using value_type = _Ty;
Expand Down
4 changes: 2 additions & 2 deletions stl/inc/list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ public:
};

template <class _Value_type, class _Size_type, class _Difference_type, class _Pointer, class _Const_pointer,
class _Reference, class _Const_reference, class _Nodeptr_type>
class _Nodeptr_type>
struct _List_iter_types {
using value_type = _Value_type;
using size_type = _Size_type;
Expand Down Expand Up @@ -769,7 +769,7 @@ private:

using _Val_types = conditional_t<_Is_simple_alloc_v<_Alnode>, _List_simple_types<_Ty>,
_List_iter_types<_Ty, typename _Alty_traits::size_type, typename _Alty_traits::difference_type,
typename _Alty_traits::pointer, typename _Alty_traits::const_pointer, _Ty&, const _Ty&, _Nodeptr>>;
typename _Alty_traits::pointer, typename _Alty_traits::const_pointer, _Nodeptr>>;

using _Scary_val = _List_val<_Val_types>;

Expand Down
5 changes: 2 additions & 3 deletions stl/inc/vector
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,7 @@ struct pointer_traits<_Vector_iterator<_Myvec>> {
};
#endif // _HAS_CXX20

template <class _Value_type, class _Size_type, class _Difference_type, class _Pointer, class _Const_pointer,
class _Reference, class _Const_reference>
template <class _Value_type, class _Size_type, class _Difference_type, class _Pointer, class _Const_pointer>
struct _Vec_iter_types {
using value_type = _Value_type;
using size_type = _Size_type;
Expand Down Expand Up @@ -599,7 +598,7 @@ private:
#endif // !_INSERT_VECTOR_ANNOTATION

using _Scary_val = _Vector_val<conditional_t<_Is_simple_alloc_v<_Alty>, _Simple_types<_Ty>,
_Vec_iter_types<_Ty, size_type, difference_type, pointer, const_pointer, _Ty&, const _Ty&>>>;
_Vec_iter_types<_Ty, size_type, difference_type, pointer, const_pointer>>>;

public:
using iterator = _Vector_iterator<_Scary_val>;
Expand Down
3 changes: 1 addition & 2 deletions stl/inc/xhash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,7 @@ struct _Hash_vec {
using difference_type = typename _Aliter_traits::difference_type;
using pointer = typename _Aliter_traits::pointer;
using _Aliter_scary_val = _Vector_val<conditional_t<_Is_simple_alloc_v<_Aliter>, _Simple_types<value_type>,
_Vec_iter_types<value_type, size_type, difference_type, pointer, typename _Aliter_traits::const_pointer,
value_type&, const value_type&>>>;
_Vec_iter_types<value_type, size_type, difference_type, pointer, typename _Aliter_traits::const_pointer>>>;

_Hash_vec() : _Mypair(_Zero_then_variadic_args_t{}) {
_Mypair._Myval2._Alloc_proxy(_GET_PROXY_ALLOCATOR(_Aliter, _Mypair._Get_first()));
Expand Down
5 changes: 2 additions & 3 deletions stl/inc/xstring
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2190,8 +2190,7 @@ struct pointer_traits<_String_iterator<_Mystr>> {
};
#endif // _HAS_CXX20

template <class _Value_type, class _Size_type, class _Difference_type, class _Pointer, class _Const_pointer,
class _Reference, class _Const_reference>
template <class _Value_type, class _Size_type, class _Difference_type, class _Pointer, class _Const_pointer>
struct _String_iter_types {
using value_type = _Value_type;
using size_type = _Size_type;
Expand Down Expand Up @@ -2329,7 +2328,7 @@ private:

using _Scary_val = _String_val<conditional_t<_Is_simple_alloc_v<_Alty>, _Simple_types<_Elem>,
_String_iter_types<_Elem, typename _Alty_traits::size_type, typename _Alty_traits::difference_type,
typename _Alty_traits::pointer, typename _Alty_traits::const_pointer, _Elem&, const _Elem&>>>;
typename _Alty_traits::pointer, typename _Alty_traits::const_pointer>>>;

static_assert(!_ENFORCE_MATCHING_ALLOCATORS || is_same_v<_Elem, typename _Alloc::value_type>,
_MISMATCHED_ALLOCATOR_MESSAGE("basic_string<T, Traits, Allocator>", "T"));
Expand Down
5 changes: 2 additions & 3 deletions stl/inc/xtree
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ public:
};

template <class _Value_type, class _Size_type, class _Difference_type, class _Pointer, class _Const_pointer,
class _Reference, class _Const_reference, class _Nodeptr_type>
class _Nodeptr_type>
struct _Tree_iter_types {
using value_type = _Value_type;
using size_type = _Size_type;
Expand Down Expand Up @@ -842,8 +842,7 @@ protected:

using _Scary_val = _Tree_val<conditional_t<_Is_simple_alloc_v<_Alnode>, _Tree_simple_types<value_type>,
_Tree_iter_types<value_type, typename _Alty_traits::size_type, typename _Alty_traits::difference_type,
typename _Alty_traits::pointer, typename _Alty_traits::const_pointer, value_type&, const value_type&,
_Nodeptr>>>;
typename _Alty_traits::pointer, typename _Alty_traits::const_pointer, _Nodeptr>>>;

static constexpr bool _Multi = _Traits::_Multi;
static constexpr bool _Is_set = is_same_v<key_type, value_type>;
Expand Down