From b5c3952aa98525aa420b9e3499c44aae7903e6e3 Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Mon, 12 Jun 2023 20:41:47 +0800 Subject: [PATCH 01/11] for forward_list --- stl/inc/forward_list | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/stl/inc/forward_list b/stl/inc/forward_list index aefc8c2437..ff565866f5 100644 --- a/stl/inc/forward_list +++ b/stl/inc/forward_list @@ -226,8 +226,7 @@ public: } }; -template +template struct _Flist_iter_types { using value_type = _Value_type; using size_type = _Size_type; @@ -524,7 +523,7 @@ private: using _Scary_val = _Flist_val, _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; From b1ca3f295dd56cb36d3f505813cbedf3e4dafbab Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Mon, 12 Jun 2023 20:44:23 +0800 Subject: [PATCH 02/11] for xstring --- stl/inc/xstring | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/stl/inc/xstring b/stl/inc/xstring index b7fcb187ec..c1d4843c15 100644 --- a/stl/inc/xstring +++ b/stl/inc/xstring @@ -2190,8 +2190,7 @@ struct pointer_traits<_String_iterator<_Mystr>> { }; #endif // _HAS_CXX20 -template +template struct _String_iter_types { using value_type = _Value_type; using size_type = _Size_type; @@ -2329,7 +2328,7 @@ private: using _Scary_val = _String_val, _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")); From 5b203d8a0b94be688d244907219ac8075cc65d02 Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Mon, 12 Jun 2023 20:46:48 +0800 Subject: [PATCH 03/11] for list --- stl/inc/list | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/stl/inc/list b/stl/inc/list index 8eae947c0b..23b6d91495 100644 --- a/stl/inc/list +++ b/stl/inc/list @@ -272,8 +272,7 @@ public: } }; -template +template struct _List_iter_types { using value_type = _Value_type; using size_type = _Size_type; @@ -769,7 +768,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>; From a4572ede4fe35efb7c907509d1afabf9cb6b73a2 Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Mon, 12 Jun 2023 20:49:13 +0800 Subject: [PATCH 04/11] for deque --- stl/inc/deque | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/stl/inc/deque b/stl/inc/deque index 0d84db3cd8..28ce246b83 100644 --- a/stl/inc/deque +++ b/stl/inc/deque @@ -518,8 +518,7 @@ public: } }; -template +template struct _Deque_iter_types { using value_type = _Value_type; using size_type = _Size_type; @@ -587,7 +586,7 @@ private: using _Scary_val = _Deque_val, _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; From 93308d3ab4f714fcfe44ac90f54e28bc2ae1337e Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Mon, 12 Jun 2023 20:51:02 +0800 Subject: [PATCH 05/11] for xtree --- stl/inc/xtree | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/stl/inc/xtree b/stl/inc/xtree index 639185e639..872c508aef 100644 --- a/stl/inc/xtree +++ b/stl/inc/xtree @@ -308,8 +308,7 @@ public: } }; -template +template struct _Tree_iter_types { using value_type = _Value_type; using size_type = _Size_type; @@ -842,8 +841,7 @@ protected: using _Scary_val = _Tree_val, _Tree_simple_types, _Tree_iter_types>>; + typename _Alty_traits::pointer, typename _Alty_traits::const_pointer, _Nodeptr>>>; static constexpr bool _Multi = _Traits::_Multi; static constexpr bool _Is_set = is_same_v; From 345e82e431cdff0ee96967b8894c38311450924f Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Mon, 12 Jun 2023 20:52:51 +0800 Subject: [PATCH 06/11] for vector 0 --- stl/inc/vector | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/stl/inc/vector b/stl/inc/vector index b0942c2d2b..ac67044eae 100644 --- a/stl/inc/vector +++ b/stl/inc/vector @@ -370,8 +370,7 @@ struct pointer_traits<_Vector_iterator<_Myvec>> { }; #endif // _HAS_CXX20 -template +template struct _Vec_iter_types { using value_type = _Value_type; using size_type = _Size_type; @@ -599,7 +598,7 @@ private: #endif // !_INSERT_VECTOR_ANNOTATION using _Scary_val = _Vector_val, _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>; From 1b717c0dbc2da744b556865d32fae9cfc0f411ba Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Mon, 12 Jun 2023 20:53:53 +0800 Subject: [PATCH 07/11] for vector 1 --- stl/inc/xhash | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stl/inc/xhash b/stl/inc/xhash index 71460bb5e2..bfa25a8963 100644 --- a/stl/inc/xhash +++ b/stl/inc/xhash @@ -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, _Simple_types, - _Vec_iter_types>>; + _Vec_iter_types>>; _Hash_vec() : _Mypair(_Zero_then_variadic_args_t{}) { _Mypair._Myval2._Alloc_proxy(_GET_PROXY_ALLOCATOR(_Aliter, _Mypair._Get_first())); From f74c10dc2f6bb2c7213c3263058be18bac589d35 Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Mon, 12 Jun 2023 21:27:35 +0800 Subject: [PATCH 08/11] format 0 --- stl/inc/xtree | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stl/inc/xtree b/stl/inc/xtree index 872c508aef..add065cc15 100644 --- a/stl/inc/xtree +++ b/stl/inc/xtree @@ -308,7 +308,8 @@ public: } }; -template +template struct _Tree_iter_types { using value_type = _Value_type; using size_type = _Size_type; From 4c72faf49d476f829b3e89d7460260b2cfb8f391 Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Mon, 12 Jun 2023 21:29:17 +0800 Subject: [PATCH 09/11] format 1 --- stl/inc/forward_list | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stl/inc/forward_list b/stl/inc/forward_list index ff565866f5..1e70f99f0c 100644 --- a/stl/inc/forward_list +++ b/stl/inc/forward_list @@ -226,7 +226,8 @@ public: } }; -template +template struct _Flist_iter_types { using value_type = _Value_type; using size_type = _Size_type; From 5a52c1eed4363130c54d6df25c91f11a5914e3bb Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Mon, 12 Jun 2023 21:30:21 +0800 Subject: [PATCH 10/11] format 2 --- stl/inc/list | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stl/inc/list b/stl/inc/list index 23b6d91495..b8f816ab18 100644 --- a/stl/inc/list +++ b/stl/inc/list @@ -272,7 +272,8 @@ public: } }; -template +template struct _List_iter_types { using value_type = _Value_type; using size_type = _Size_type; From 59c6ca42ea8ba08ca14b6b3ba7ff19dbdde5b2be Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Mon, 12 Jun 2023 21:31:05 +0800 Subject: [PATCH 11/11] format 3 --- stl/inc/deque | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stl/inc/deque b/stl/inc/deque index 28ce246b83..df2a84a12d 100644 --- a/stl/inc/deque +++ b/stl/inc/deque @@ -518,7 +518,8 @@ public: } }; -template +template struct _Deque_iter_types { using value_type = _Value_type; using size_type = _Size_type;