Skip to content

Commit 4b85be7

Browse files
committed
uglify-static-members
1 parent dd13efe commit 4b85be7

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

libcxx/include/__algorithm/radix_sort.h

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ struct __radix_sort_traits {
101101
using radix_type = decay_t<invoke_result_t<_Radix, image_type> >;
102102
static_assert(is_integral<radix_type>::value, "");
103103

104-
constexpr static auto radix_value_range = numeric_limits<radix_type>::max() + 1;
105-
constexpr static auto radix_size = std::__intlog2<uint64_t>(radix_value_range);
106-
constexpr static auto radix_count = sizeof(image_type) * CHAR_BIT / radix_size;
104+
constexpr static auto __radix_value_range = numeric_limits<radix_type>::max() + 1;
105+
constexpr static auto __radix_size = std::__intlog2<uint64_t>(__radix_value_range);
106+
constexpr static auto __radix_count = sizeof(image_type) * CHAR_BIT / __radix_size;
107107
};
108108

109109
template <typename _Value, typename _Map>
@@ -112,8 +112,8 @@ struct __counting_sort_traits {
112112
static_assert(is_integral<image_type>::value, "");
113113
static_assert(is_unsigned<image_type>::value, "");
114114

115-
constexpr static const auto value_range = numeric_limits<image_type>::max() + 1;
116-
constexpr static auto radix_size = std::__intlog2<uint64_t>(value_range);
115+
constexpr static const auto __value_range = numeric_limits<image_type>::max() + 1;
116+
constexpr static auto __radix_size = std::__intlog2<uint64_t>(__value_range);
117117
};
118118

119119
template <typename _Radix>
@@ -124,7 +124,7 @@ _LIBCPP_HIDE_FROM_ABI auto __nth_radix(size_t __radix_number, _Radix __radix) {
124124
static_assert(is_unsigned<value_type>::value, "");
125125
using traits = __counting_sort_traits<value_type, _Radix>;
126126

127-
return __radix(static_cast<value_type>(__n >> traits::radix_size * __radix_number));
127+
return __radix(static_cast<value_type>(__n >> traits::__radix_size * __radix_number));
128128
};
129129
}
130130

@@ -142,7 +142,7 @@ __collect(_ForwardIterator __first, _ForwardIterator __last, _Map __map, _Random
142142

143143
std::__count(__first, __last, __map, __counters);
144144

145-
const auto __counters_end = __counters + traits::value_range;
145+
const auto __counters_end = __counters + traits::__value_range;
146146
std::partial_sum(__counters, __counters_end, __counters);
147147
}
148148

@@ -192,7 +192,7 @@ _LIBCPP_HIDE_FROM_ABI bool __collect_impl(
192192
_RandomAccessIterator2 __maximums,
193193
index_sequence<_Radices...>) {
194194
using value_type = typename iterator_traits<_ForwardIterator>::value_type;
195-
constexpr auto __radix_value_range = __radix_sort_traits<value_type, _Map, _Radix>::radix_value_range;
195+
constexpr auto __radix_value_range = __radix_sort_traits<value_type, _Map, _Radix>::__radix_value_range;
196196

197197
auto __previous = numeric_limits<invoke_result_t<_Map, value_type> >::min();
198198
auto __is_sorted = true;
@@ -225,7 +225,7 @@ __collect(_ForwardIterator __first,
225225
_RandomAccessIterator1 __counters,
226226
_RandomAccessIterator2 __maximums) {
227227
using value_type = typename iterator_traits<_ForwardIterator>::value_type;
228-
constexpr auto __radix_count = __radix_sort_traits<value_type, _Map, _Radix>::radix_count;
228+
constexpr auto __radix_count = __radix_sort_traits<value_type, _Map, _Radix>::__radix_count;
229229
return std::__collect_impl(
230230
__first, __last, __map, __radix, __counters, __maximums, make_index_sequence<__radix_count>());
231231
}
@@ -255,17 +255,17 @@ __counting_sort_impl(_ForwardIterator __first, _ForwardIterator __last, _RandomA
255255
using traits = __counting_sort_traits<value_type, _Map>;
256256

257257
using difference_type = typename iterator_traits<_RandomAccessIterator>::difference_type;
258-
difference_type __counters[traits::value_range + 1] = {0};
258+
difference_type __counters[traits::__value_range + 1] = {0};
259259

260260
std::__collect(__first, __last, __map, std::next(std::begin(__counters)));
261261
std::__dispose(__first, __last, __result, __map, std::begin(__counters));
262262

263-
return __result + __counters[traits::value_range];
263+
return __result + __counters[traits::__value_range];
264264
}
265265

266266
template <typename _RandomAccessIterator1, typename _RandomAccessIterator2, typename _Map, typename _Radix>
267267
_LIBCPP_HIDE_FROM_ABI typename enable_if<
268-
__radix_sort_traits<typename iterator_traits<_RandomAccessIterator1>::value_type, _Map, _Radix>::radix_count == 1,
268+
__radix_sort_traits<typename iterator_traits<_RandomAccessIterator1>::value_type, _Map, _Radix>::__radix_count == 1,
269269
void>::type
270270
__radix_sort_impl(_RandomAccessIterator1 __first,
271271
_RandomAccessIterator1 __last,
@@ -283,7 +283,8 @@ __radix_sort_impl(_RandomAccessIterator1 __first,
283283

284284
template <typename _RandomAccessIterator1, typename _RandomAccessIterator2, typename _Map, typename _Radix>
285285
_LIBCPP_HIDE_FROM_ABI typename enable_if<
286-
__radix_sort_traits<typename iterator_traits<_RandomAccessIterator1>::value_type, _Map, _Radix>::radix_count % 2 ==
286+
__radix_sort_traits<typename iterator_traits<_RandomAccessIterator1>::value_type, _Map, _Radix>::__radix_count %
287+
2 ==
287288
0,
288289
void>::type
289290
__radix_sort_impl(_RandomAccessIterator1 __first,
@@ -295,13 +296,13 @@ __radix_sort_impl(_RandomAccessIterator1 __first,
295296
using traits = __radix_sort_traits<value_type, _Map, _Radix>;
296297

297298
using difference_type = typename iterator_traits<_RandomAccessIterator1>::difference_type;
298-
difference_type __counters[traits::radix_count][traits::radix_value_range] = {{0}};
299-
difference_type __maximums[traits::radix_count] = {0};
299+
difference_type __counters[traits::__radix_count][traits::__radix_value_range] = {{0}};
300+
difference_type __maximums[traits::__radix_count] = {0};
300301
const auto __is_sorted = std::__collect(__first, __last, __map, __radix, __counters, __maximums);
301302
if (not __is_sorted) {
302303
const auto __range_size = std::distance(__first, __last);
303304
auto __buffer_end = __buffer_begin + __range_size;
304-
for (size_t __radix_number = 0; __radix_number < traits::radix_count; __radix_number += 2) {
305+
for (size_t __radix_number = 0; __radix_number < traits::__radix_count; __radix_number += 2) {
305306
const auto __n0th_is_single = __maximums[__radix_number] == __range_size;
306307
const auto __n1th_is_single = __maximums[__radix_number + 1] == __range_size;
307308

0 commit comments

Comments
 (0)