From f1d4ebb1d4eeec81a6473ef28bafaadb066bab6d Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Fri, 21 Jul 2023 03:31:18 +0800 Subject: [PATCH 1/7] for --- stl/inc/compare | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stl/inc/compare b/stl/inc/compare index 04b3d5292f7..9648d60c3c4 100644 --- a/stl/inc/compare +++ b/stl/inc/compare @@ -423,7 +423,7 @@ namespace _Strong_order { } else if constexpr (_Strat == _St::_Floating) { using _Floating_type = decay_t<_Ty1>; using _Traits = _Floating_type_traits<_Floating_type>; - using _Uint_type = typename _Traits::_Uint_type; + using _Uint_type = _Traits::_Uint_type; using _Sint_type = make_signed_t<_Uint_type>; const auto _Left_uint = _Bit_cast<_Uint_type>(_Left); @@ -530,7 +530,7 @@ namespace _Weak_order { } else if constexpr (_Strat == _St::_Floating) { using _Floating_type = decay_t<_Ty1>; using _Traits = _Floating_type_traits<_Floating_type>; - using _Uint_type = typename _Traits::_Uint_type; + using _Uint_type = _Traits::_Uint_type; using _Sint_type = make_signed_t<_Uint_type>; auto _Left_uint = _Bit_cast<_Uint_type>(_Left); From 50474c62036cd1c086c3b2dfdf4f25edeb5a45ba Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Fri, 21 Jul 2023 03:33:56 +0800 Subject: [PATCH 2/7] for --- stl/inc/coroutine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stl/inc/coroutine b/stl/inc/coroutine index 9a9d16e1133..2f5f631b036 100644 --- a/stl/inc/coroutine +++ b/stl/inc/coroutine @@ -40,7 +40,7 @@ struct _Coroutine_traits {}; template struct _Coroutine_traits<_Ret, void_t> { - using promise_type = typename _Ret::promise_type; + using promise_type = _Ret::promise_type; }; _EXPORT_STD template From 2291402226d00072c303e12664116a40c9bd1858 Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Fri, 21 Jul 2023 03:36:19 +0800 Subject: [PATCH 3/7] for --- stl/inc/numbers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stl/inc/numbers b/stl/inc/numbers index bb00953acc1..a54abf9c7e4 100644 --- a/stl/inc/numbers +++ b/stl/inc/numbers @@ -95,7 +95,7 @@ namespace numbers { }; template - using _Reject_invalid_t = typename _Reject_invalid<_Ty>::type; + using _Reject_invalid_t = _Reject_invalid<_Ty>::type; _EXPORT_STD template inline constexpr _Ty e_v = static_cast<_Reject_invalid_t<_Ty>>(2.718281828459045); From b7761ec3dc3836d20e85ca52fb6fbcf1c7659331 Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Fri, 21 Jul 2023 03:38:24 +0800 Subject: [PATCH 4/7] for --- stl/inc/syncstream | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/stl/inc/syncstream b/stl/inc/syncstream index 969d756a051..b7971d8a979 100644 --- a/stl/inc/syncstream +++ b/stl/inc/syncstream @@ -69,15 +69,15 @@ protected: _EXPORT_STD template class basic_syncbuf : public _Basic_syncbuf_impl<_Elem, _Traits> { public: - using int_type = typename _Traits::int_type; - using pos_type = typename _Traits::pos_type; - using off_type = typename _Traits::off_type; + using int_type = _Traits::int_type; + using pos_type = _Traits::pos_type; + using off_type = _Traits::off_type; using allocator_type = _Alloc; using streambuf_type = basic_streambuf<_Elem, _Traits>; using _Mybase = _Basic_syncbuf_impl<_Elem, _Traits>; - using _Pointer = typename allocator_traits<_Alloc>::pointer; - using _Size_type = typename allocator_traits<_Alloc>::size_type; + using _Pointer = allocator_traits<_Alloc>::pointer; + using _Size_type = allocator_traits<_Alloc>::size_type; using _Mybase::set_emit_on_sync; @@ -319,9 +319,9 @@ _EXPORT_STD template class basic_osyncstream : public basic_ostream<_Elem, _Traits> { public: using char_type = _Elem; - using int_type = typename _Traits::int_type; - using pos_type = typename _Traits::pos_type; - using off_type = typename _Traits::off_type; + using int_type = _Traits::int_type; + using pos_type = _Traits::pos_type; + using off_type = _Traits::off_type; using traits_type = _Traits; using allocator_type = _Alloc; using streambuf_type = basic_streambuf<_Elem, _Traits>; From d617dae4a906b4b894a3fcfe5a1198664fed80e0 Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Fri, 21 Jul 2023 03:43:33 +0800 Subject: [PATCH 5/7] for --- stl/inc/ranges | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/stl/inc/ranges b/stl/inc/ranges index fe82e889990..7cfd05a01fe 100644 --- a/stl/inc/ranges +++ b/stl/inc/ranges @@ -1499,7 +1499,7 @@ namespace ranges { using iterator_concept = random_access_iterator_tag; using iterator_category = random_access_iterator_tag; using value_type = _Ty; - using difference_type = typename _Repeat_view_difference_type<_Index_type>::type; + using difference_type = _Repeat_view_difference_type<_Index_type>::type; _Iterator() = default; @@ -4814,7 +4814,7 @@ namespace ranges { template class _Inner_iter_base<_BaseTy> { private: - using _BaseCategory = typename iterator_traits>::iterator_category; + using _BaseCategory = iterator_traits>::iterator_category; public: using iterator_category = @@ -4881,7 +4881,7 @@ namespace ranges { } public: - using iterator_concept = typename _Outer_iter<_Const>::iterator_concept; + using iterator_concept = _Outer_iter<_Const>::iterator_concept; using value_type = range_value_t<_BaseTy>; using difference_type = range_difference_t<_BaseTy>; @@ -7729,7 +7729,7 @@ namespace ranges { template class _Category_base<_BaseTy> { private: - using _BaseCategory = typename iterator_traits>::iterator_category; + using _BaseCategory = iterator_traits>::iterator_category; public: using iterator_category = conditional_t, @@ -8684,7 +8684,7 @@ namespace ranges { : _Parent(_STD addressof(_Parent_)), _Inner(_STD move(_Inner_)) {} public: - using iterator_concept = typename _Ziperator<_IsConst>::iterator_concept; + using iterator_concept = _Ziperator<_IsConst>::iterator_concept; using value_type = remove_cvref_t&, range_reference_t<_Maybe_const<_IsConst, _ViewTypes>>...>>; using difference_type = range_difference_t<_Base_t>; @@ -9006,7 +9006,7 @@ namespace ranges { }; template - using _Repeated_tuple = typename _Repeated_tuple_impl<_Ty, make_index_sequence<_Nx>>::type; + using _Repeated_tuple = _Repeated_tuple_impl<_Ty, make_index_sequence<_Nx>>::type; template inline constexpr bool _Regular_invocable_with_repeated_type_impl = false; @@ -9033,7 +9033,7 @@ namespace ranges { template using _Invoke_result_with_repeated_type = - typename _Invoke_result_with_repeated_type_impl<_Fn, _Ty, make_index_sequence<_Nx>>::type; + _Invoke_result_with_repeated_type_impl<_Fn, _Ty, make_index_sequence<_Nx>>::type; template concept _Adjacent_transform_constraints = @@ -9478,7 +9478,7 @@ namespace ranges { range_reference_t<_Base>, _Nx>>) { return input_iterator_tag{}; } else { - using _Cat = typename iterator_traits>::iterator_category; + using _Cat = iterator_traits>::iterator_category; if constexpr (derived_from<_Cat, random_access_iterator_tag>) { return random_access_iterator_tag{}; @@ -9500,7 +9500,7 @@ namespace ranges { public: using iterator_category = decltype(_Get_iterator_category()); - using iterator_concept = typename _Inner_iterator<_Const>::iterator_concept; + using iterator_concept = _Inner_iterator<_Const>::iterator_concept; using value_type = remove_cvref_t< _Invoke_result_with_repeated_type<_Maybe_const<_Const, _Fn>&, range_reference_t<_Base>, _Nx>>; using difference_type = range_difference_t<_Base>; From 64a6b7686afc0a0fa906539fc5aec8baa4be3e31 Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Fri, 21 Jul 2023 03:45:55 +0800 Subject: [PATCH 6/7] for --- stl/inc/stacktrace | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stl/inc/stacktrace b/stl/inc/stacktrace index b3f96a181f1..68b7ca4230a 100644 --- a/stl/inc/stacktrace +++ b/stl/inc/stacktrace @@ -125,12 +125,12 @@ public: using value_type = stacktrace_entry; using const_reference = const value_type&; using reference = value_type&; - using const_iterator = typename _Frames_t::const_iterator; + using const_iterator = _Frames_t::const_iterator; using iterator = const_iterator; using reverse_iterator = _STD reverse_iterator; using const_reverse_iterator = _STD reverse_iterator; - using difference_type = typename _Frames_t::difference_type; - using size_type = typename _Frames_t::size_type; + using difference_type = _Frames_t::difference_type; + using size_type = _Frames_t::size_type; using allocator_type = _Alloc; // __declspec(noinline) to make the same behavior for debug and release. From 849bfd8c1f3dc5d68c680df7ec27cfae87d3f69e Mon Sep 17 00:00:00 2001 From: achabense <60953653+achabense@users.noreply.github.com> Date: Fri, 21 Jul 2023 03:59:44 +0800 Subject: [PATCH 7/7] revert the change to Co-authored-by: Casey Carter --- stl/inc/coroutine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stl/inc/coroutine b/stl/inc/coroutine index 2f5f631b036..9a9d16e1133 100644 --- a/stl/inc/coroutine +++ b/stl/inc/coroutine @@ -40,7 +40,7 @@ struct _Coroutine_traits {}; template struct _Coroutine_traits<_Ret, void_t> { - using promise_type = _Ret::promise_type; + using promise_type = typename _Ret::promise_type; }; _EXPORT_STD template