Skip to content

Commit 6d43651

Browse files
philnik777philnik777
committed
[libc++][NFC] Replace _VSTD with std in __bit_reference
Reviewed By: #libc, Mordante Spies: Mordante, libcxx-commits Differential Revision: https://reviews.llvm.org/D156037
1 parent 50a1f74 commit 6d43651

File tree

1 file changed

+48
-48
lines changed

1 file changed

+48
-48
lines changed

‎libcxx/include/__bit_reference‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,11 @@ __find_bool(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
200200
if (__first.__ctz_ != 0)
201201
{
202202
__storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
203-
__storage_type __dn = _VSTD::min(__clz_f, __n);
203+
__storage_type __dn = std::min(__clz_f, __n);
204204
__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
205205
__storage_type __b = std::__invert_if<!_ToFind>(*__first.__seg_) & __m;
206206
if (__b)
207-
return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__libcpp_ctz(__b)));
207+
return _It(__first.__seg_, static_cast<unsigned>(std::__libcpp_ctz(__b)));
208208
if (__n == __dn)
209209
return __first + __n;
210210
__n -= __dn;
@@ -214,15 +214,15 @@ __find_bool(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
214214
for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word) {
215215
__storage_type __b = std::__invert_if<!_ToFind>(*__first.__seg_);
216216
if (__b)
217-
return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__libcpp_ctz(__b)));
217+
return _It(__first.__seg_, static_cast<unsigned>(std::__libcpp_ctz(__b)));
218218
}
219219
// do last partial word
220220
if (__n > 0)
221221
{
222222
__storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
223223
__storage_type __b = std::__invert_if<!_ToFind>(*__first.__seg_) & __m;
224224
if (__b)
225-
return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__libcpp_ctz(__b)));
225+
return _It(__first.__seg_, static_cast<unsigned>(std::__libcpp_ctz(__b)));
226226
}
227227
return _It(__first.__seg_, static_cast<unsigned>(__n));
228228
}
@@ -233,8 +233,8 @@ __bit_iterator<_Cp, _IsConst>
233233
find(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, const _Tp& __value)
234234
{
235235
if (static_cast<bool>(__value))
236-
return _VSTD::__find_bool<true>(__first, static_cast<typename _Cp::size_type>(__last - __first));
237-
return _VSTD::__find_bool<false>(__first, static_cast<typename _Cp::size_type>(__last - __first));
236+
return std::__find_bool<true>(__first, static_cast<typename _Cp::size_type>(__last - __first));
237+
return std::__find_bool<false>(__first, static_cast<typename _Cp::size_type>(__last - __first));
238238
}
239239

240240
// count
@@ -253,20 +253,20 @@ __count_bool(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
253253
if (__first.__ctz_ != 0)
254254
{
255255
__storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
256-
__storage_type __dn = _VSTD::min(__clz_f, __n);
256+
__storage_type __dn = std::min(__clz_f, __n);
257257
__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
258-
__r = _VSTD::__libcpp_popcount(std::__invert_if<!_ToCount>(*__first.__seg_) & __m);
258+
__r = std::__libcpp_popcount(std::__invert_if<!_ToCount>(*__first.__seg_) & __m);
259259
__n -= __dn;
260260
++__first.__seg_;
261261
}
262262
// do middle whole words
263263
for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word)
264-
__r += _VSTD::__libcpp_popcount(std::__invert_if<!_ToCount>(*__first.__seg_));
264+
__r += std::__libcpp_popcount(std::__invert_if<!_ToCount>(*__first.__seg_));
265265
// do last partial word
266266
if (__n > 0)
267267
{
268268
__storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
269-
__r += _VSTD::__libcpp_popcount(std::__invert_if<!_ToCount>(*__first.__seg_) & __m);
269+
__r += std::__libcpp_popcount(std::__invert_if<!_ToCount>(*__first.__seg_) & __m);
270270
}
271271
return __r;
272272
}
@@ -277,8 +277,8 @@ typename __bit_iterator<_Cp, _IsConst>::difference_type
277277
count(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, const _Tp& __value)
278278
{
279279
if (static_cast<bool>(__value))
280-
return _VSTD::__count_bool<true>(__first, static_cast<typename _Cp::size_type>(__last - __first));
281-
return _VSTD::__count_bool<false>(__first, static_cast<typename _Cp::size_type>(__last - __first));
280+
return std::__count_bool<true>(__first, static_cast<typename _Cp::size_type>(__last - __first));
281+
return std::__count_bool<false>(__first, static_cast<typename _Cp::size_type>(__last - __first));
282282
}
283283

284284
// fill_n
@@ -295,7 +295,7 @@ __fill_n(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)
295295
if (__first.__ctz_ != 0)
296296
{
297297
__storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
298-
__storage_type __dn = _VSTD::min(__clz_f, __n);
298+
__storage_type __dn = std::min(__clz_f, __n);
299299
__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
300300
if (_FillValue)
301301
*__first.__seg_ |= __m;
@@ -328,9 +328,9 @@ fill_n(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n, bool __v
328328
if (__n > 0)
329329
{
330330
if (__value)
331-
_VSTD::__fill_n<true>(__first, __n);
331+
std::__fill_n<true>(__first, __n);
332332
else
333-
_VSTD::__fill_n<false>(__first, __n);
333+
std::__fill_n<false>(__first, __n);
334334
}
335335
}
336336

@@ -341,7 +341,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
341341
void
342342
fill(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __last, bool __value)
343343
{
344-
_VSTD::fill_n(__first, static_cast<typename _Cp::size_type>(__last - __first), __value);
344+
std::fill_n(__first, static_cast<typename _Cp::size_type>(__last - __first), __value);
345345
}
346346

347347
// copy
@@ -363,7 +363,7 @@ __copy_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsCon
363363
if (__first.__ctz_ != 0)
364364
{
365365
unsigned __clz = __bits_per_word - __first.__ctz_;
366-
difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz), __n);
366+
difference_type __dn = std::min(static_cast<difference_type>(__clz), __n);
367367
__n -= __dn;
368368
__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
369369
__storage_type __b = *__first.__seg_ & __m;
@@ -411,12 +411,12 @@ __copy_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsC
411411
if (__first.__ctz_ != 0)
412412
{
413413
unsigned __clz_f = __bits_per_word - __first.__ctz_;
414-
difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz_f), __n);
414+
difference_type __dn = std::min(static_cast<difference_type>(__clz_f), __n);
415415
__n -= __dn;
416416
__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
417417
__storage_type __b = *__first.__seg_ & __m;
418418
unsigned __clz_r = __bits_per_word - __result.__ctz_;
419-
__storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r);
419+
__storage_type __ddn = std::min<__storage_type>(__dn, __clz_r);
420420
__m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
421421
*__result.__seg_ &= ~__m;
422422
if (__result.__ctz_ > __first.__ctz_)
@@ -454,7 +454,7 @@ __copy_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsC
454454
{
455455
__m = ~__storage_type(0) >> (__bits_per_word - __n);
456456
__storage_type __b = *__first.__seg_ & __m;
457-
__storage_type __dn = _VSTD::min(__n, static_cast<difference_type>(__clz_r));
457+
__storage_type __dn = std::min(__n, static_cast<difference_type>(__clz_r));
458458
__m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
459459
*__result.__seg_ &= ~__m;
460460
*__result.__seg_ |= __b << __result.__ctz_;
@@ -479,8 +479,8 @@ __bit_iterator<_Cp, false>
479479
copy(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
480480
{
481481
if (__first.__ctz_ == __result.__ctz_)
482-
return _VSTD::__copy_aligned(__first, __last, __result);
483-
return _VSTD::__copy_unaligned(__first, __last, __result);
482+
return std::__copy_aligned(__first, __last, __result);
483+
return std::__copy_unaligned(__first, __last, __result);
484484
}
485485

486486
// copy_backward
@@ -501,7 +501,7 @@ __copy_backward_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_C
501501
// do first word
502502
if (__last.__ctz_ != 0)
503503
{
504-
difference_type __dn = _VSTD::min(static_cast<difference_type>(__last.__ctz_), __n);
504+
difference_type __dn = std::min(static_cast<difference_type>(__last.__ctz_), __n);
505505
__n -= __dn;
506506
unsigned __clz = __bits_per_word - __last.__ctz_;
507507
__storage_type __m = (~__storage_type(0) << (__last.__ctz_ - __dn)) & (~__storage_type(0) >> __clz);
@@ -549,13 +549,13 @@ __copy_backward_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<
549549
// do first word
550550
if (__last.__ctz_ != 0)
551551
{
552-
difference_type __dn = _VSTD::min(static_cast<difference_type>(__last.__ctz_), __n);
552+
difference_type __dn = std::min(static_cast<difference_type>(__last.__ctz_), __n);
553553
__n -= __dn;
554554
unsigned __clz_l = __bits_per_word - __last.__ctz_;
555555
__storage_type __m = (~__storage_type(0) << (__last.__ctz_ - __dn)) & (~__storage_type(0) >> __clz_l);
556556
__storage_type __b = *__last.__seg_ & __m;
557557
unsigned __clz_r = __bits_per_word - __result.__ctz_;
558-
__storage_type __ddn = _VSTD::min(__dn, static_cast<difference_type>(__result.__ctz_));
558+
__storage_type __ddn = std::min(__dn, static_cast<difference_type>(__result.__ctz_));
559559
if (__ddn > 0)
560560
{
561561
__m = (~__storage_type(0) << (__result.__ctz_ - __ddn)) & (~__storage_type(0) >> __clz_r);
@@ -599,7 +599,7 @@ __copy_backward_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<
599599
__m = ~__storage_type(0) << (__bits_per_word - __n);
600600
__storage_type __b = *--__last.__seg_ & __m;
601601
__clz_r = __bits_per_word - __result.__ctz_;
602-
__storage_type __dn = _VSTD::min(__n, static_cast<difference_type>(__result.__ctz_));
602+
__storage_type __dn = std::min(__n, static_cast<difference_type>(__result.__ctz_));
603603
__m = (~__storage_type(0) << (__result.__ctz_ - __dn)) & (~__storage_type(0) >> __clz_r);
604604
*__result.__seg_ &= ~__m;
605605
*__result.__seg_ |= __b >> (__bits_per_word - __result.__ctz_);
@@ -626,8 +626,8 @@ __bit_iterator<_Cp, false>
626626
copy_backward(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
627627
{
628628
if (__last.__ctz_ == __result.__ctz_)
629-
return _VSTD::__copy_backward_aligned(__first, __last, __result);
630-
return _VSTD::__copy_backward_unaligned(__first, __last, __result);
629+
return std::__copy_backward_aligned(__first, __last, __result);
630+
return std::__copy_backward_unaligned(__first, __last, __result);
631631
}
632632

633633
// move
@@ -637,7 +637,7 @@ inline _LIBCPP_HIDE_FROM_ABI
637637
__bit_iterator<_Cp, false>
638638
move(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
639639
{
640-
return _VSTD::copy(__first, __last, __result);
640+
return std::copy(__first, __last, __result);
641641
}
642642

643643
// move_backward
@@ -647,7 +647,7 @@ inline _LIBCPP_HIDE_FROM_ABI
647647
__bit_iterator<_Cp, false>
648648
move_backward(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
649649
{
650-
return _VSTD::copy_backward(__first, __last, __result);
650+
return std::copy_backward(__first, __last, __result);
651651
}
652652

653653
// swap_ranges
@@ -669,7 +669,7 @@ __swap_ranges_aligned(__bit_iterator<_Cl, false> __first, __bit_iterator<_Cl, fa
669669
if (__first.__ctz_ != 0)
670670
{
671671
unsigned __clz = __bits_per_word - __first.__ctz_;
672-
difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz), __n);
672+
difference_type __dn = std::min(static_cast<difference_type>(__clz), __n);
673673
__n -= __dn;
674674
__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
675675
__storage_type __b1 = *__first.__seg_ & __m;
@@ -720,13 +720,13 @@ __swap_ranges_unaligned(__bit_iterator<_Cl, false> __first, __bit_iterator<_Cl,
720720
if (__first.__ctz_ != 0)
721721
{
722722
unsigned __clz_f = __bits_per_word - __first.__ctz_;
723-
difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz_f), __n);
723+
difference_type __dn = std::min(static_cast<difference_type>(__clz_f), __n);
724724
__n -= __dn;
725725
__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
726726
__storage_type __b1 = *__first.__seg_ & __m;
727727
*__first.__seg_ &= ~__m;
728728
unsigned __clz_r = __bits_per_word - __result.__ctz_;
729-
__storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r);
729+
__storage_type __ddn = std::min<__storage_type>(__dn, __clz_r);
730730
__m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
731731
__storage_type __b2 = *__result.__seg_ & __m;
732732
*__result.__seg_ &= ~__m;
@@ -781,7 +781,7 @@ __swap_ranges_unaligned(__bit_iterator<_Cl, false> __first, __bit_iterator<_Cl,
781781
__m = ~__storage_type(0) >> (__bits_per_word - __n);
782782
__storage_type __b1 = *__first.__seg_ & __m;
783783
*__first.__seg_ &= ~__m;
784-
__storage_type __dn = _VSTD::min<__storage_type>(__n, __clz_r);
784+
__storage_type __dn = std::min<__storage_type>(__n, __clz_r);
785785
__m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
786786
__storage_type __b2 = *__result.__seg_ & __m;
787787
*__result.__seg_ &= ~__m;
@@ -811,8 +811,8 @@ swap_ranges(__bit_iterator<_Cl, false> __first1, __bit_iterator<_Cl, false> __la
811811
__bit_iterator<_Cr, false> __first2)
812812
{
813813
if (__first1.__ctz_ == __first2.__ctz_)
814-
return _VSTD::__swap_ranges_aligned(__first1, __last1, __first2);
815-
return _VSTD::__swap_ranges_unaligned(__first1, __last1, __first2);
814+
return std::__swap_ranges_aligned(__first1, __last1, __first2);
815+
return std::__swap_ranges_unaligned(__first1, __last1, __first2);
816816
}
817817

818818
// rotate
@@ -867,13 +867,13 @@ rotate(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __middle,
867867
if (__d1 <= __bit_array<_Cp>::capacity())
868868
{
869869
__bit_array<_Cp> __b(__d1);
870-
_VSTD::copy(__first, __middle, __b.begin());
871-
_VSTD::copy(__b.begin(), __b.end(), _VSTD::copy(__middle, __last, __first));
870+
std::copy(__first, __middle, __b.begin());
871+
std::copy(__b.begin(), __b.end(), std::copy(__middle, __last, __first));
872872
break;
873873
}
874874
else
875875
{
876-
__bit_iterator<_Cp, false> __mp = _VSTD::swap_ranges(__first, __middle, __middle);
876+
__bit_iterator<_Cp, false> __mp = std::swap_ranges(__first, __middle, __middle);
877877
__first = __middle;
878878
__middle = __mp;
879879
__d2 -= __d1;
@@ -884,14 +884,14 @@ rotate(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __middle,
884884
if (__d2 <= __bit_array<_Cp>::capacity())
885885
{
886886
__bit_array<_Cp> __b(__d2);
887-
_VSTD::copy(__middle, __last, __b.begin());
888-
_VSTD::copy_backward(__b.begin(), __b.end(), _VSTD::copy_backward(__first, __middle, __last));
887+
std::copy(__middle, __last, __b.begin());
888+
std::copy_backward(__b.begin(), __b.end(), std::copy_backward(__first, __middle, __last));
889889
break;
890890
}
891891
else
892892
{
893893
__bit_iterator<_Cp, false> __mp = __first + __d2;
894-
_VSTD::swap_ranges(__first, __mp, __middle);
894+
std::swap_ranges(__first, __mp, __middle);
895895
__first = __mp;
896896
__d1 -= __d2;
897897
}
@@ -919,12 +919,12 @@ __equal_unaligned(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1>
919919
if (__first1.__ctz_ != 0)
920920
{
921921
unsigned __clz_f = __bits_per_word - __first1.__ctz_;
922-
difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz_f), __n);
922+
difference_type __dn = std::min(static_cast<difference_type>(__clz_f), __n);
923923
__n -= __dn;
924924
__storage_type __m = (~__storage_type(0) << __first1.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
925925
__storage_type __b = *__first1.__seg_ & __m;
926926
unsigned __clz_r = __bits_per_word - __first2.__ctz_;
927-
__storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r);
927+
__storage_type __ddn = std::min<__storage_type>(__dn, __clz_r);
928928
__m = (~__storage_type(0) << __first2.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
929929
if (__first2.__ctz_ > __first1.__ctz_)
930930
{
@@ -967,7 +967,7 @@ __equal_unaligned(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1>
967967
{
968968
__m = ~__storage_type(0) >> (__bits_per_word - __n);
969969
__storage_type __b = *__first1.__seg_ & __m;
970-
__storage_type __dn = _VSTD::min(__n, static_cast<difference_type>(__clz_r));
970+
__storage_type __dn = std::min(__n, static_cast<difference_type>(__clz_r));
971971
__m = (~__storage_type(0) << __first2.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
972972
if ((*__first2.__seg_ & __m) != (__b << __first2.__ctz_))
973973
return false;
@@ -1002,7 +1002,7 @@ __equal_aligned(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __
10021002
if (__first1.__ctz_ != 0)
10031003
{
10041004
unsigned __clz = __bits_per_word - __first1.__ctz_;
1005-
difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz), __n);
1005+
difference_type __dn = std::min(static_cast<difference_type>(__clz), __n);
10061006
__n -= __dn;
10071007
__storage_type __m = (~__storage_type(0) << __first1.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
10081008
if ((*__first2.__seg_ & __m) != (*__first1.__seg_ & __m))
@@ -1035,8 +1035,8 @@ bool
10351035
equal(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1, __bit_iterator<_Cp, _IC2> __first2)
10361036
{
10371037
if (__first1.__ctz_ == __first2.__ctz_)
1038-
return _VSTD::__equal_aligned(__first1, __last1, __first2);
1039-
return _VSTD::__equal_unaligned(__first1, __last1, __first2);
1038+
return std::__equal_aligned(__first1, __last1, __first2);
1039+
return std::__equal_unaligned(__first1, __last1, __first2);
10401040
}
10411041

10421042
template <class _Cp, bool _IsConst,

0 commit comments

Comments
 (0)