@@ -51,28 +51,28 @@ inline _LIBCPP_HIDE_FROM_ABI void __variadic_expansion_dummy(initializer_list<in
5151
5252# define _EXPAND_VARIADIC (expression ) std::__variadic_expansion_dummy({(expression, 0 )...})
5353
54- template <typename _Iterator>
54+ template <class _Iterator >
5555_LIBCPP_HIDE_FROM_ABI constexpr auto __move_assign_please (_Iterator __i)
5656 -> enable_if_t<is_move_assignable<typename iterator_traits<_Iterator>::value_type>::value,
5757 move_iterator<_Iterator> > {
5858 return std::make_move_iterator (std::move (__i));
5959}
6060
61- template <typename _Iterator>
61+ template <class _Iterator >
6262_LIBCPP_HIDE_FROM_ABI constexpr auto __move_assign_please (_Iterator __i)
6363 -> enable_if_t<not is_move_assignable<typename iterator_traits<_Iterator>::value_type>::value, _Iterator> {
6464 return __i;
6565}
6666
67- template <typename _UnsignedInteger>
67+ template <class _UnsignedInteger >
6868_LIBCPP_HIDE_FROM_ABI constexpr _UnsignedInteger __intlog2 (_UnsignedInteger __n) {
6969 static_assert (is_integral<_UnsignedInteger>::value, " Must be an integral type" );
7070 static_assert (is_unsigned<_UnsignedInteger>::value, " Must be unsigned" );
7171
7272 return numeric_limits<_UnsignedInteger>::digits - 1 - std::__countl_zero (__n);
7373}
7474
75- template <typename _InputIterator, typename _OutputIterator>
75+ template <class _InputIterator , class _OutputIterator >
7676_LIBCPP_HIDE_FROM_ABI pair<_OutputIterator, typename iterator_traits<_InputIterator>::value_type>
7777__partial_sum_max (_InputIterator __first, _InputIterator __last, _OutputIterator __result) {
7878 if (__first == __last)
@@ -92,7 +92,7 @@ __partial_sum_max(_InputIterator __first, _InputIterator __last, _OutputIterator
9292 return {++__result, __max};
9393}
9494
95- template <typename _Value, typename _Map, typename _Radix>
95+ template <class _Value , class _Map , class _Radix >
9696struct __radix_sort_traits {
9797 using image_type = decay_t <invoke_result_t <_Map, _Value> >;
9898 static_assert (is_integral<image_type>::value, " " );
@@ -106,7 +106,7 @@ struct __radix_sort_traits {
106106 constexpr static auto __radix_count = sizeof (image_type) * CHAR_BIT / __radix_size;
107107};
108108
109- template <typename _Value, typename _Map>
109+ template <class _Value , class _Map >
110110struct __counting_sort_traits {
111111 using image_type = decay_t <invoke_result_t <_Map, _Value> >;
112112 static_assert (is_integral<image_type>::value, " " );
@@ -116,7 +116,7 @@ struct __counting_sort_traits {
116116 constexpr static auto __radix_size = std::__intlog2<uint64_t >(__value_range);
117117};
118118
119- template <typename _Radix>
119+ template <class _Radix >
120120_LIBCPP_HIDE_FROM_ABI auto __nth_radix (size_t __radix_number, _Radix __radix) {
121121 return [__radix_number, __radix = std::move (__radix)](auto __n) {
122122 using value_type = decltype (__n);
@@ -128,13 +128,13 @@ _LIBCPP_HIDE_FROM_ABI auto __nth_radix(size_t __radix_number, _Radix __radix) {
128128 };
129129}
130130
131- template <typename _ForwardIterator, typename _Map, typename _RandomAccessIterator>
131+ template <class _ForwardIterator , class _Map , class _RandomAccessIterator >
132132_LIBCPP_HIDE_FROM_ABI void
133133__count (_ForwardIterator __first, _ForwardIterator __last, _Map __map, _RandomAccessIterator __counters) {
134134 std::for_each (__first, __last, [&__counters, &__map](const auto & __preimage) { ++__counters[__map (__preimage)]; });
135135}
136136
137- template <typename _ForwardIterator, typename _Map, typename _RandomAccessIterator>
137+ template <class _ForwardIterator , class _Map , class _RandomAccessIterator >
138138_LIBCPP_HIDE_FROM_ABI void
139139__collect (_ForwardIterator __first, _ForwardIterator __last, _Map __map, _RandomAccessIterator __counters) {
140140 using value_type = typename iterator_traits<_ForwardIterator>::value_type;
@@ -146,7 +146,7 @@ __collect(_ForwardIterator __first, _ForwardIterator __last, _Map __map, _Random
146146 std::partial_sum (__counters, __counters_end, __counters);
147147}
148148
149- template <typename _ForwardIterator, typename _RandomAccessIterator1, typename _Map, typename _RandomAccessIterator2>
149+ template <class _ForwardIterator , class _RandomAccessIterator1 , class _Map , class _RandomAccessIterator2 >
150150_LIBCPP_HIDE_FROM_ABI void
151151__dispose (_ForwardIterator __first,
152152 _ForwardIterator __last,
@@ -159,10 +159,7 @@ __dispose(_ForwardIterator __first,
159159 });
160160}
161161
162- template <typename _BidirectionalIterator,
163- typename _RandomAccessIterator1,
164- typename _Map,
165- typename _RandomAccessIterator2>
162+ template <class _BidirectionalIterator , class _RandomAccessIterator1 , class _Map , class _RandomAccessIterator2 >
166163_LIBCPP_HIDE_FROM_ABI void dispose_backward (
167164 _BidirectionalIterator __first,
168165 _BidirectionalIterator __last,
@@ -177,11 +174,11 @@ _LIBCPP_HIDE_FROM_ABI void dispose_backward(
177174 });
178175}
179176
180- template <typename _ForwardIterator,
181- typename _Map,
182- typename _Radix,
183- typename _RandomAccessIterator1,
184- typename _RandomAccessIterator2,
177+ template <class _ForwardIterator ,
178+ class _Map ,
179+ class _Radix ,
180+ class _RandomAccessIterator1 ,
181+ class _RandomAccessIterator2 ,
185182 size_t ... _Radices>
186183_LIBCPP_HIDE_FROM_ABI bool __collect_impl (
187184 _ForwardIterator __first,
@@ -212,11 +209,7 @@ _LIBCPP_HIDE_FROM_ABI bool __collect_impl(
212209 return __is_sorted;
213210}
214211
215- template <typename _ForwardIterator,
216- typename _Map,
217- typename _Radix,
218- typename _RandomAccessIterator1,
219- typename _RandomAccessIterator2>
212+ template <class _ForwardIterator , class _Map , class _Radix , class _RandomAccessIterator1 , class _RandomAccessIterator2 >
220213_LIBCPP_HIDE_FROM_ABI bool
221214__collect (_ForwardIterator __first,
222215 _ForwardIterator __last,
@@ -230,10 +223,7 @@ __collect(_ForwardIterator __first,
230223 __first, __last, __map, __radix, __counters, __maximums, make_index_sequence<__radix_count>());
231224}
232225
233- template <typename _BidirectionalIterator,
234- typename _RandomAccessIterator1,
235- typename _Map,
236- typename _RandomAccessIterator2>
226+ template <class _BidirectionalIterator , class _RandomAccessIterator1 , class _Map , class _RandomAccessIterator2 >
237227_LIBCPP_HIDE_FROM_ABI void __dispose_backward (
238228 _BidirectionalIterator __first,
239229 _BidirectionalIterator __last,
@@ -248,7 +238,7 @@ _LIBCPP_HIDE_FROM_ABI void __dispose_backward(
248238 });
249239}
250240
251- template <typename _ForwardIterator, typename _RandomAccessIterator, typename _Map>
241+ template <class _ForwardIterator , class _RandomAccessIterator , class _Map >
252242_LIBCPP_HIDE_FROM_ABI _RandomAccessIterator
253243__counting_sort_impl (_ForwardIterator __first, _ForwardIterator __last, _RandomAccessIterator __result, _Map __map) {
254244 using value_type = typename iterator_traits<_ForwardIterator>::value_type;
@@ -263,7 +253,7 @@ __counting_sort_impl(_ForwardIterator __first, _ForwardIterator __last, _RandomA
263253 return __result + __counters[traits::__value_range];
264254}
265255
266- template <typename _RandomAccessIterator1, typename _RandomAccessIterator2, typename _Map, typename _Radix>
256+ template <class _RandomAccessIterator1 , class _RandomAccessIterator2 , class _Map , class _Radix >
267257_LIBCPP_HIDE_FROM_ABI typename enable_if<
268258 __radix_sort_traits<typename iterator_traits<_RandomAccessIterator1>::value_type, _Map, _Radix>::__radix_count == 1 ,
269259 void >::type
@@ -281,7 +271,7 @@ __radix_sort_impl(_RandomAccessIterator1 __first,
281271 std::copy (std::__move_assign_please (buffer), std::__move_assign_please (__buffer_end), __first);
282272}
283273
284- template <typename _RandomAccessIterator1, typename _RandomAccessIterator2, typename _Map, typename _Radix>
274+ template <class _RandomAccessIterator1 , class _RandomAccessIterator2 , class _Map , class _Radix >
285275_LIBCPP_HIDE_FROM_ABI typename enable_if<
286276 __radix_sort_traits<typename iterator_traits<_RandomAccessIterator1>::value_type, _Map, _Radix>::__radix_count %
287277 2 ==
@@ -343,21 +333,21 @@ __radix_sort_impl(_RandomAccessIterator1 __first,
343333
344334_LIBCPP_HIDE_FROM_ABI constexpr auto __to_unsigned (bool __b) { return __b; }
345335
346- template <typename _Ip>
336+ template <class _Ip >
347337_LIBCPP_HIDE_FROM_ABI constexpr auto __to_unsigned (_Ip __n) {
348338 constexpr const auto __min_value = numeric_limits<_Ip>::min ();
349339 return static_cast <make_unsigned_t <_Ip> >(__n ^ __min_value);
350340}
351341
352342struct __identity_fn {
353- template <typename _Tp>
343+ template <class _Tp >
354344 _LIBCPP_HIDE_FROM_ABI constexpr decltype (auto ) operator()(_Tp&& __value) const {
355345 return std::forward<_Tp>(__value);
356346 }
357347};
358348
359349struct __low_byte_fn {
360- template <typename _Ip>
350+ template <class _Ip >
361351 _LIBCPP_HIDE_FROM_ABI constexpr uint8_t operator ()(_Ip __integer) const {
362352 static_assert (is_integral<_Ip>::value, " " );
363353 static_assert (is_unsigned<_Ip>::value, " " );
@@ -366,7 +356,7 @@ struct __low_byte_fn {
366356 }
367357};
368358
369- template <typename _RandomAccessIterator1, typename _RandomAccessIterator2, typename _Map, typename _Radix>
359+ template <class _RandomAccessIterator1 , class _RandomAccessIterator2 , class _Map , class _Radix >
370360_LIBCPP_HIDE_FROM_ABI void
371361__radix_sort (_RandomAccessIterator1 __first,
372362 _RandomAccessIterator1 __last,
@@ -377,20 +367,20 @@ __radix_sort(_RandomAccessIterator1 __first,
377367 std::__radix_sort_impl (__first, __last, buffer, __map_to_unsigned, __radix);
378368}
379369
380- template <typename _RandomAccessIterator1, typename _RandomAccessIterator2>
370+ template <class _RandomAccessIterator1 , class _RandomAccessIterator2 >
381371_LIBCPP_HIDE_FROM_ABI void
382372__radix_sort (_RandomAccessIterator1 __first, _RandomAccessIterator1 __last, _RandomAccessIterator2 buffer) {
383373 std::__radix_sort (__first, __last, buffer, __identity_fn{}, __low_byte_fn{});
384374}
385375
386- template <typename _RandomAccessIterator1, typename _RandomAccessIterator2>
376+ template <class _RandomAccessIterator1 , class _RandomAccessIterator2 >
387377_LIBCPP_HIDE_FROM_ABI bool __radix_sort (
388378 _RandomAccessIterator1 __first, _RandomAccessIterator1 __last, _RandomAccessIterator2 buffer, _BoolConstant<true >) {
389379 std::__radix_sort (__first, __last, buffer, __identity_fn{}, __low_byte_fn{});
390380 return true ;
391381}
392382
393- template <typename _RandomAccessIterator1, typename _RandomAccessIterator2>
383+ template <class _RandomAccessIterator1 , class _RandomAccessIterator2 >
394384_LIBCPP_HIDE_FROM_ABI bool
395385__radix_sort (_RandomAccessIterator1, _RandomAccessIterator1, _RandomAccessIterator2, _BoolConstant<false >) {
396386 return false ;
@@ -400,7 +390,7 @@ __radix_sort(_RandomAccessIterator1, _RandomAccessIterator1, _RandomAccessIterat
400390
401391#else // _LIBCPP_STD_VER > 14
402392
403- template <typename _RandomAccessIterator1, typename _RandomAccessIterator2, bool _EnableRadixSort>
393+ template <class _RandomAccessIterator1 , class _RandomAccessIterator2 , bool _EnableRadixSort>
404394_LIBCPP_HIDE_FROM_ABI bool
405395__radix_sort (_RandomAccessIterator1, _RandomAccessIterator1, _RandomAccessIterator2, _BoolConstant<_EnableRadixSort>) {
406396 return false ;
0 commit comments