Skip to content

Commit 1e83e47

Browse files
localspooklocalspook
committed
hmm
1 parent 2f3eee7 commit 1e83e47

File tree

160 files changed

+631
-655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+631
-655
lines changed

‎libcxx/include/__algorithm/copy.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ template <class _Cp, bool _IsConst>
4242
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, false> __copy_aligned(
4343
__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result) {
4444
using _In = __bit_iterator<_Cp, _IsConst>;
45-
using difference_type = typename _In::difference_type;
46-
using __storage_type = typename _In::__storage_type;
45+
using difference_type = _In::difference_type;
46+
using __storage_type = _In::__storage_type;
4747

4848
const int __bits_per_word = _In::__bits_per_word;
4949
difference_type __n = __last - __first;
@@ -87,8 +87,8 @@ template <class _Cp, bool _IsConst>
8787
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, false> __copy_unaligned(
8888
__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result) {
8989
using _In = __bit_iterator<_Cp, _IsConst>;
90-
using difference_type = typename _In::difference_type;
91-
using __storage_type = typename _In::__storage_type;
90+
using difference_type = _In::difference_type;
91+
using __storage_type = _In::__storage_type;
9292

9393
const int __bits_per_word = _In::__bits_per_word;
9494
difference_type __n = __last - __first;
@@ -177,7 +177,7 @@ struct __copy_impl {
177177
: __result_(__result) {}
178178

179179
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void
180-
operator()(typename _Traits::__local_iterator __lfirst, typename _Traits::__local_iterator __llast) {
180+
operator()(_Traits::__local_iterator __lfirst, _Traits::__local_iterator __llast) {
181181
__result_ = std::__copy(__lfirst, __llast, std::move(__result_)).second;
182182
}
183183
};
@@ -197,7 +197,7 @@ struct __copy_impl {
197197
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
198198
operator()(_InIter __first, _InIter __last, _OutIter __result) const {
199199
using _Traits = __segmented_iterator_traits<_OutIter>;
200-
using _DiffT = typename common_type<__iter_diff_t<_InIter>, __iter_diff_t<_OutIter> >::type;
200+
using _DiffT = common_type<__iter_diff_t<_InIter>, __iter_diff_t<_OutIter> >::type;
201201

202202
if (__first == __last)
203203
return std::make_pair(std::move(__first), std::move(__result));

‎libcxx/include/__algorithm/copy_backward.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ template <class _Cp, bool _IsConst>
4141
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, false> __copy_backward_aligned(
4242
__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result) {
4343
using _In = __bit_iterator<_Cp, _IsConst>;
44-
using difference_type = typename _In::difference_type;
45-
using __storage_type = typename _In::__storage_type;
44+
using difference_type = _In::difference_type;
45+
using __storage_type = _In::__storage_type;
4646

4747
const int __bits_per_word = _In::__bits_per_word;
4848
difference_type __n = __last - __first;
@@ -83,8 +83,8 @@ template <class _Cp, bool _IsConst>
8383
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, false> __copy_backward_unaligned(
8484
__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result) {
8585
using _In = __bit_iterator<_Cp, _IsConst>;
86-
using difference_type = typename _In::difference_type;
87-
using __storage_type = typename _In::__storage_type;
86+
using difference_type = _In::difference_type;
87+
using __storage_type = _In::__storage_type;
8888

8989
const int __bits_per_word = _In::__bits_per_word;
9090
difference_type __n = __last - __first;
@@ -214,7 +214,7 @@ struct __copy_backward_impl {
214214

215215
auto __local_last = _Traits::__local(__result);
216216
while (true) {
217-
using _DiffT = typename common_type<__iter_diff_t<_InIter>, __iter_diff_t<_OutIter> >::type;
217+
using _DiffT = common_type<__iter_diff_t<_InIter>, __iter_diff_t<_OutIter> >::type;
218218

219219
auto __local_first = _Traits::__begin(__segment_iterator);
220220
auto __size = std::min<_DiffT>(__local_last - __local_first, __last - __first);

‎libcxx/include/__algorithm/copy_n.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ template <class _InputIterator,
4949
__enable_if_t<__has_random_access_iterator_category<_InputIterator>::value, int> = 0>
5050
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
5151
copy_n(_InputIterator __first, _Size __orig_n, _OutputIterator __result) {
52-
typedef typename iterator_traits<_InputIterator>::difference_type difference_type;
52+
typedef iterator_traits<_InputIterator>::difference_type difference_type;
5353
typedef decltype(std::__convert_to_integral(__orig_n)) _IntegralSize;
5454
_IntegralSize __n = __orig_n;
5555
return std::copy(__first, __first + difference_type(__n), __result);

‎libcxx/include/__algorithm/count.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
3232

3333
// generic implementation
3434
template <class _AlgPolicy, class _Iter, class _Sent, class _Tp, class _Proj>
35-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 typename _IterOps<_AlgPolicy>::template __difference_type<_Iter>
35+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _IterOps<_AlgPolicy>::template __difference_type<_Iter>
3636
__count(_Iter __first, _Sent __last, const _Tp& __value, _Proj& __proj) {
3737
typename _IterOps<_AlgPolicy>::template __difference_type<_Iter> __r(0);
3838
for (; __first != __last; ++__first)
@@ -43,11 +43,11 @@ __count(_Iter __first, _Sent __last, const _Tp& __value, _Proj& __proj) {
4343

4444
// __bit_iterator implementation
4545
template <bool _ToCount, class _Cp, bool _IsConst>
46-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 typename __bit_iterator<_Cp, _IsConst>::difference_type
46+
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator<_Cp, _IsConst>::difference_type
4747
__count_bool(__bit_iterator<_Cp, _IsConst> __first, typename __size_difference_type_traits<_Cp>::size_type __n) {
4848
using _It = __bit_iterator<_Cp, _IsConst>;
49-
using __storage_type = typename _It::__storage_type;
50-
using difference_type = typename _It::difference_type;
49+
using __storage_type = _It::__storage_type;
50+
using difference_type = _It::difference_type;
5151

5252
const int __bits_per_word = _It::__bits_per_word;
5353
difference_type __r = 0;
@@ -76,9 +76,9 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __iter_diff_t<__bit_iterator
7676
__count(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, const _Tp& __value, _Proj&) {
7777
if (__value)
7878
return std::__count_bool<true>(
79-
__first, static_cast<typename __size_difference_type_traits<_Cp>::size_type>(__last - __first));
79+
__first, static_cast<__size_difference_type_traits<_Cp>::size_type>(__last - __first));
8080
return std::__count_bool<false>(
81-
__first, static_cast<typename __size_difference_type_traits<_Cp>::size_type>(__last - __first));
81+
__first, static_cast<__size_difference_type_traits<_Cp>::size_type>(__last - __first));
8282
}
8383

8484
template <class _InputIterator, class _Tp>

‎libcxx/include/__algorithm/count_if.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ __count_if(_Iter __first, _Sent __last, _Pred& __pred, _Proj& __proj) {
3434
}
3535

3636
template <class _InputIterator, class _Predicate>
37-
[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
38-
typename iterator_traits<_InputIterator>::difference_type
37+
[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI
38+
_LIBCPP_CONSTEXPR_SINCE_CXX20 iterator_traits<_InputIterator>::difference_type
3939
count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
4040
__identity __proj;
4141
return std::__count_if<_ClassicAlgPolicy>(__first, __last, __pred, __proj);

‎libcxx/include/__algorithm/equal.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ __equal_unaligned(__bit_iterator<_Cp, _IsConst1> __first1,
4343
__bit_iterator<_Cp, _IsConst1> __last1,
4444
__bit_iterator<_Cp, _IsConst2> __first2) {
4545
using _It = __bit_iterator<_Cp, _IsConst1>;
46-
using difference_type = typename _It::difference_type;
47-
using __storage_type = typename _It::__storage_type;
46+
using difference_type = _It::difference_type;
47+
using __storage_type = _It::__storage_type;
4848

4949
const int __bits_per_word = _It::__bits_per_word;
5050
difference_type __n = __last1 - __first1;
@@ -121,8 +121,8 @@ __equal_aligned(__bit_iterator<_Cp, _IsConst1> __first1,
121121
__bit_iterator<_Cp, _IsConst1> __last1,
122122
__bit_iterator<_Cp, _IsConst2> __first2) {
123123
using _It = __bit_iterator<_Cp, _IsConst1>;
124-
using difference_type = typename _It::difference_type;
125-
using __storage_type = typename _It::__storage_type;
124+
using difference_type = _It::difference_type;
125+
using __storage_type = _It::__storage_type;
126126

127127
const int __bits_per_word = _It::__bits_per_word;
128128
difference_type __n = __last1 - __first1;

‎libcxx/include/__algorithm/fill_n.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ template <bool _FillVal, class _Cp>
3434
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
3535
__fill_n_bool(__bit_iterator<_Cp, false> __first, typename __size_difference_type_traits<_Cp>::size_type __n) {
3636
using _It = __bit_iterator<_Cp, false>;
37-
using __storage_type = typename _It::__storage_type;
37+
using __storage_type = _It::__storage_type;
3838

3939
const int __bits_per_word = _It::__bits_per_word;
4040
// do first partial word

‎libcxx/include/__algorithm/find.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ template <bool _ToFind, class _Cp, bool _IsConst>
163163
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, _IsConst>
164164
__find_bool(__bit_iterator<_Cp, _IsConst> __first, typename __size_difference_type_traits<_Cp>::size_type __n) {
165165
using _It = __bit_iterator<_Cp, _IsConst>;
166-
using __storage_type = typename _It::__storage_type;
166+
using __storage_type = _It::__storage_type;
167167

168168
const int __bits_per_word = _It::__bits_per_word;
169169
// do first partial word
@@ -200,9 +200,8 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator<_Cp, _
200200
__find(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, const _Tp& __value, _Proj&) {
201201
if (static_cast<bool>(__value))
202202
return std::__find_bool<true>(
203-
__first, static_cast<typename __size_difference_type_traits<_Cp>::size_type>(__last - __first));
204-
return std::__find_bool<false>(
205-
__first, static_cast<typename __size_difference_type_traits<_Cp>::size_type>(__last - __first));
203+
__first, static_cast<__size_difference_type_traits<_Cp>::size_type>(__last - __first));
204+
return std::__find_bool<false>(__first, static_cast<__size_difference_type_traits<_Cp>::size_type>(__last - __first));
206205
}
207206

208207
// segmented iterator implementation

‎libcxx/include/__algorithm/for_each.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ template <class _SegmentedIterator,
4242
__enable_if_t<__is_segmented_iterator_v<_SegmentedIterator>, int> = 0>
4343
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _SegmentedIterator
4444
__for_each(_SegmentedIterator __first, _SegmentedIterator __last, _Func& __func, _Proj& __proj) {
45-
using __local_iterator_t = typename __segmented_iterator_traits<_SegmentedIterator>::__local_iterator;
45+
using __local_iterator_t = __segmented_iterator_traits<_SegmentedIterator>::__local_iterator;
4646
std::__for_each_segment(__first, __last, [&](__local_iterator_t __lfirst, __local_iterator_t __llast) {
4747
std::__for_each(__lfirst, __llast, __func, __proj);
4848
});

‎libcxx/include/__algorithm/for_each_n.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ template <class _SegmentedIterator,
7777
int> = 0>
7878
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _SegmentedIterator
7979
__for_each_n(_SegmentedIterator __first, _Size __orig_n, _Func& __f, _Proj& __proj) {
80-
using __local_iterator_t = typename __segmented_iterator_traits<_SegmentedIterator>::__local_iterator;
80+
using __local_iterator_t = __segmented_iterator_traits<_SegmentedIterator>::__local_iterator;
8181
return std::__for_each_n_segment(__first, __orig_n, [&](__local_iterator_t __lfirst, __local_iterator_t __llast) {
8282
std::__for_each(__lfirst, __llast, __f, __proj);
8383
});

0 commit comments

Comments
 (0)