Skip to content

Commit 77a00c0

Browse files
ldionneldionne
authored
[libc++] Replace uses of _VSTD:: by std:: (llvm#74331)
As part of the upcoming clang-formatting of libc++, this patch performs the long desired removal of the _VSTD macro. See https://discourse.llvm.org/t/rfc-clang-formatting-all-of-libc-once-and-for-all for the clang-format proposal.
1 parent c568927 commit 77a00c0

File tree

210 files changed

+2303
-2307
lines changed

Some content is hidden

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

210 files changed

+2303
-2307
lines changed

‎libcxx/docs/Contributing.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ avoid invoking a user-defined ``operator,``, make sure to cast the result to
6767
In general, try to follow the style of existing code. There are a few
6868
exceptions:
6969

70-
- ``_VSTD::foo`` is no longer used in new code. Use ``std::foo`` instead.
7170
- Prefer ``using foo = int`` over ``typedef int foo``. The compilers supported
7271
by libc++ accept alias declarations in all standard modes.
7372

‎libcxx/include/__algorithm/clamp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI constexpr const _Tp&
3535
clamp(_LIBCPP_LIFETIMEBOUND const _Tp& __v,
3636
_LIBCPP_LIFETIMEBOUND const _Tp& __lo,
3737
_LIBCPP_LIFETIMEBOUND const _Tp& __hi) {
38-
return _VSTD::clamp(__v, __lo, __hi, __less<>());
38+
return std::clamp(__v, __lo, __hi, __less<>());
3939
}
4040
#endif
4141

‎libcxx/include/__algorithm/copy_n.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2828
_OutputIterator
2929
copy_n(_InputIterator __first, _Size __orig_n, _OutputIterator __result)
3030
{
31-
typedef decltype(_VSTD::__convert_to_integral(__orig_n)) _IntegralSize;
31+
typedef decltype(std::__convert_to_integral(__orig_n)) _IntegralSize;
3232
_IntegralSize __n = __orig_n;
3333
if (__n > 0)
3434
{
@@ -51,9 +51,9 @@ _OutputIterator
5151
copy_n(_InputIterator __first, _Size __orig_n, _OutputIterator __result)
5252
{
5353
typedef typename iterator_traits<_InputIterator>::difference_type difference_type;
54-
typedef decltype(_VSTD::__convert_to_integral(__orig_n)) _IntegralSize;
54+
typedef decltype(std::__convert_to_integral(__orig_n)) _IntegralSize;
5555
_IntegralSize __n = __orig_n;
56-
return _VSTD::copy(__first, __first + difference_type(__n), __result);
56+
return std::copy(__first, __first + difference_type(__n), __result);
5757
}
5858

5959
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/equal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
107107
__equal(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, _RandomAccessIterator2 __first2,
108108
_RandomAccessIterator2 __last2, _BinaryPredicate __pred, random_access_iterator_tag,
109109
random_access_iterator_tag) {
110-
if (_VSTD::distance(__first1, __last1) != _VSTD::distance(__first2, __last2))
110+
if (std::distance(__first1, __last1) != std::distance(__first2, __last2))
111111
return false;
112112
__identity __proj;
113113
return std::__equal_impl(
@@ -124,7 +124,7 @@ template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
124124
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
125125
equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2,
126126
_BinaryPredicate __pred) {
127-
return _VSTD::__equal<_BinaryPredicate&>(
127+
return std::__equal<_BinaryPredicate&>(
128128
__first1, __last1, __first2, __last2, __pred, typename iterator_traits<_InputIterator1>::iterator_category(),
129129
typename iterator_traits<_InputIterator2>::iterator_category());
130130
}

‎libcxx/include/__algorithm/fill.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
3535
void
3636
__fill(_RandomAccessIterator __first, _RandomAccessIterator __last, const _Tp& __value, random_access_iterator_tag)
3737
{
38-
_VSTD::fill_n(__first, __last - __first, __value);
38+
std::fill_n(__first, __last - __first, __value);
3939
}
4040

4141
template <class _ForwardIterator, class _Tp>
4242
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4343
void
4444
fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
4545
{
46-
_VSTD::__fill(__first, __last, __value, typename iterator_traits<_ForwardIterator>::iterator_category());
46+
std::__fill(__first, __last, __value, typename iterator_traits<_ForwardIterator>::iterator_category());
4747
}
4848

4949
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/fill_n.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
3636
_OutputIterator
3737
fill_n(_OutputIterator __first, _Size __n, const _Tp& __value)
3838
{
39-
return _VSTD::__fill_n(__first, _VSTD::__convert_to_integral(__n), __value);
39+
return std::__fill_n(__first, std::__convert_to_integral(__n), __value);
4040
}
4141

4242
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/find_first_of.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredica
3838
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator1
3939
find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2,
4040
_ForwardIterator2 __last2, _BinaryPredicate __pred) {
41-
return _VSTD::__find_first_of_ce(__first1, __last1, __first2, __last2, __pred);
41+
return std::__find_first_of_ce(__first1, __last1, __first2, __last2, __pred);
4242
}
4343

4444
template <class _ForwardIterator1, class _ForwardIterator2>

‎libcxx/include/__algorithm/for_each_n.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ template <class _InputIterator, class _Size, class _Function>
2525
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator for_each_n(_InputIterator __first,
2626
_Size __orig_n,
2727
_Function __f) {
28-
typedef decltype(_VSTD::__convert_to_integral(__orig_n)) _IntegralSize;
28+
typedef decltype(std::__convert_to_integral(__orig_n)) _IntegralSize;
2929
_IntegralSize __n = __orig_n;
3030
while (__n > 0) {
3131
__f(*__first);

‎libcxx/include/__algorithm/generate_n.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2323
_OutputIterator
2424
generate_n(_OutputIterator __first, _Size __orig_n, _Generator __gen)
2525
{
26-
typedef decltype(_VSTD::__convert_to_integral(__orig_n)) _IntegralSize;
26+
typedef decltype(std::__convert_to_integral(__orig_n)) _IntegralSize;
2727
_IntegralSize __n = __orig_n;
2828
for (; __n > 0; ++__first, (void) --__n)
2929
*__first = __gen();

‎libcxx/include/__algorithm/inplace_merge.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,10 @@ __inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle,
224224
typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type;
225225
difference_type __len1 = _IterOps<_AlgPolicy>::distance(__first, __middle);
226226
difference_type __len2 = _IterOps<_AlgPolicy>::distance(__middle, __last);
227-
difference_type __buf_size = _VSTD::min(__len1, __len2);
227+
difference_type __buf_size = std::min(__len1, __len2);
228228
// TODO: Remove the use of std::get_temporary_buffer
229229
_LIBCPP_SUPPRESS_DEPRECATED_PUSH
230-
pair<value_type*, ptrdiff_t> __buf = _VSTD::get_temporary_buffer<value_type>(__buf_size);
230+
pair<value_type*, ptrdiff_t> __buf = std::get_temporary_buffer<value_type>(__buf_size);
231231
_LIBCPP_SUPPRESS_DEPRECATED_POP
232232
unique_ptr<value_type, __return_temporary_buffer> __h(__buf.first);
233233
return std::__inplace_merge<_AlgPolicy>(

‎libcxx/include/__algorithm/is_heap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
3636
bool
3737
is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
3838
{
39-
return _VSTD::is_heap(__first, __last, __less<>());
39+
return std::is_heap(__first, __last, __less<>());
4040
}
4141

4242
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/is_heap_until.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ template<class _RandomAccessIterator>
5858
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _RandomAccessIterator
5959
is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last)
6060
{
61-
return _VSTD::__is_heap_until(__first, __last, __less<>());
61+
return std::__is_heap_until(__first, __last, __less<>());
6262
}
6363

6464
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/is_sorted.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
2727
bool
2828
is_sorted(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
2929
{
30-
return _VSTD::__is_sorted_until<__comp_ref_type<_Compare> >(__first, __last, __comp) == __last;
30+
return std::__is_sorted_until<__comp_ref_type<_Compare> >(__first, __last, __comp) == __last;
3131
}
3232

3333
template<class _ForwardIterator>
@@ -36,7 +36,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
3636
bool
3737
is_sorted(_ForwardIterator __first, _ForwardIterator __last)
3838
{
39-
return _VSTD::is_sorted(__first, __last, __less<>());
39+
return std::is_sorted(__first, __last, __less<>());
4040
}
4141

4242
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/is_sorted_until.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ template <class _ForwardIterator, class _Compare>
4141
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
4242
is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
4343
{
44-
return _VSTD::__is_sorted_until<__comp_ref_type<_Compare> >(__first, __last, __comp);
44+
return std::__is_sorted_until<__comp_ref_type<_Compare> >(__first, __last, __comp);
4545
}
4646

4747
template<class _ForwardIterator>
4848
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
4949
is_sorted_until(_ForwardIterator __first, _ForwardIterator __last)
5050
{
51-
return _VSTD::is_sorted_until(__first, __last, __less<>());
51+
return std::is_sorted_until(__first, __last, __less<>());
5252
}
5353

5454
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/lexicographical_compare.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ bool
4242
lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
4343
_InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp)
4444
{
45-
return _VSTD::__lexicographical_compare<__comp_ref_type<_Compare> >(__first1, __last1, __first2, __last2, __comp);
45+
return std::__lexicographical_compare<__comp_ref_type<_Compare> >(__first1, __last1, __first2, __last2, __comp);
4646
}
4747

4848
template <class _InputIterator1, class _InputIterator2>
@@ -52,7 +52,7 @@ bool
5252
lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
5353
_InputIterator2 __first2, _InputIterator2 __last2)
5454
{
55-
return _VSTD::lexicographical_compare(__first1, __last1, __first2, __last2, __less<>());
55+
return std::lexicographical_compare(__first1, __last1, __first2, __last2, __less<>());
5656
}
5757

5858
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/max.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
3939
const _Tp&
4040
max(_LIBCPP_LIFETIMEBOUND const _Tp& __a, _LIBCPP_LIFETIMEBOUND const _Tp& __b)
4141
{
42-
return _VSTD::max(__a, __b, __less<>());
42+
return std::max(__a, __b, __less<>());
4343
}
4444

4545
#ifndef _LIBCPP_CXX03_LANG
@@ -50,7 +50,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
5050
_Tp
5151
max(initializer_list<_Tp> __t, _Compare __comp)
5252
{
53-
return *_VSTD::__max_element<__comp_ref_type<_Compare> >(__t.begin(), __t.end(), __comp);
53+
return *std::__max_element<__comp_ref_type<_Compare> >(__t.begin(), __t.end(), __comp);
5454
}
5555

5656
template<class _Tp>
@@ -59,7 +59,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
5959
_Tp
6060
max(initializer_list<_Tp> __t)
6161
{
62-
return *_VSTD::max_element(__t.begin(), __t.end(), __less<>());
62+
return *std::max_element(__t.begin(), __t.end(), __less<>());
6363
}
6464

6565
#endif // _LIBCPP_CXX03_LANG

‎libcxx/include/__algorithm/max_element.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ template <class _ForwardIterator, class _Compare>
4040
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator
4141
max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
4242
{
43-
return _VSTD::__max_element<__comp_ref_type<_Compare> >(__first, __last, __comp);
43+
return std::__max_element<__comp_ref_type<_Compare> >(__first, __last, __comp);
4444
}
4545

4646

4747
template <class _ForwardIterator>
4848
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator
4949
max_element(_ForwardIterator __first, _ForwardIterator __last)
5050
{
51-
return _VSTD::max_element(__first, __last, __less<>());
51+
return std::max_element(__first, __last, __less<>());
5252
}
5353

5454
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/merge.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ __merge(_InputIterator1 __first1, _InputIterator1 __last1,
3030
for (; __first1 != __last1; ++__result)
3131
{
3232
if (__first2 == __last2)
33-
return _VSTD::copy(__first1, __last1, __result);
33+
return std::copy(__first1, __last1, __result);
3434
if (__comp(*__first2, *__first1))
3535
{
3636
*__result = *__first2;
@@ -42,7 +42,7 @@ __merge(_InputIterator1 __first1, _InputIterator1 __last1,
4242
++__first1;
4343
}
4444
}
45-
return _VSTD::copy(__first2, __last2, __result);
45+
return std::copy(__first2, __last2, __result);
4646
}
4747

4848
template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
@@ -51,7 +51,7 @@ _OutputIterator
5151
merge(_InputIterator1 __first1, _InputIterator1 __last1,
5252
_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
5353
{
54-
return _VSTD::__merge<__comp_ref_type<_Compare> >(__first1, __last1, __first2, __last2, __result, __comp);
54+
return std::__merge<__comp_ref_type<_Compare> >(__first1, __last1, __first2, __last2, __result, __comp);
5555
}
5656

5757
template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
@@ -60,7 +60,7 @@ _OutputIterator
6060
merge(_InputIterator1 __first1, _InputIterator1 __last1,
6161
_InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)
6262
{
63-
return _VSTD::merge(__first1, __last1, __first2, __last2, __result, __less<>());
63+
return std::merge(__first1, __last1, __first2, __last2, __result, __less<>());
6464
}
6565

6666
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/min.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
3939
const _Tp&
4040
min(_LIBCPP_LIFETIMEBOUND const _Tp& __a, _LIBCPP_LIFETIMEBOUND const _Tp& __b)
4141
{
42-
return _VSTD::min(__a, __b, __less<>());
42+
return std::min(__a, __b, __less<>());
4343
}
4444

4545
#ifndef _LIBCPP_CXX03_LANG
@@ -50,7 +50,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
5050
_Tp
5151
min(initializer_list<_Tp> __t, _Compare __comp)
5252
{
53-
return *_VSTD::__min_element<__comp_ref_type<_Compare> >(__t.begin(), __t.end(), __comp);
53+
return *std::__min_element<__comp_ref_type<_Compare> >(__t.begin(), __t.end(), __comp);
5454
}
5555

5656
template<class _Tp>
@@ -59,7 +59,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
5959
_Tp
6060
min(initializer_list<_Tp> __t)
6161
{
62-
return *_VSTD::min_element(__t.begin(), __t.end(), __less<>());
62+
return *std::min_element(__t.begin(), __t.end(), __less<>());
6363
}
6464

6565
#endif // _LIBCPP_CXX03_LANG

‎libcxx/include/__algorithm/min_element.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ template <class _ForwardIterator>
6464
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _ForwardIterator
6565
min_element(_ForwardIterator __first, _ForwardIterator __last)
6666
{
67-
return _VSTD::min_element(__first, __last, __less<>());
67+
return std::min_element(__first, __last, __less<>());
6868
}
6969

7070
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/next_permutation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
6969
bool
7070
next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last)
7171
{
72-
return _VSTD::next_permutation(__first, __last, __less<>());
72+
return std::next_permutation(__first, __last, __less<>());
7373
}
7474

7575
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/nth_element.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ __nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth, _Rando
9292
if (!__comp(*__i, *__m)) // if *__first == *__m
9393
{
9494
// *__first == *__m, *__first doesn't go in first part
95-
if (_VSTD::__nth_element_find_guard<_Compare>(__i, __j, __m, __comp)) {
95+
if (std::__nth_element_find_guard<_Compare>(__i, __j, __m, __comp)) {
9696
_Ops::iter_swap(__i, __j);
9797
++__n_swaps;
9898
} else {
@@ -142,7 +142,7 @@ __nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth, _Rando
142142
return;
143143
}
144144
// __nth_element the second part
145-
// _VSTD::__nth_element<_Compare>(__i, __nth, __last, __comp);
145+
// std::__nth_element<_Compare>(__i, __nth, __last, __comp);
146146
__first = __i;
147147
continue;
148148
}
@@ -228,12 +228,12 @@ __nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth, _Rando
228228
// __nth_element on range containing __nth
229229
if (__nth < __i)
230230
{
231-
// _VSTD::__nth_element<_Compare>(__first, __nth, __i, __comp);
231+
// std::__nth_element<_Compare>(__first, __nth, __i, __comp);
232232
__last = __i;
233233
}
234234
else
235235
{
236-
// _VSTD::__nth_element<_Compare>(__i+1, __nth, __last, __comp);
236+
// std::__nth_element<_Compare>(__i+1, __nth, __last, __comp);
237237
__first = ++__i;
238238
}
239239
}

‎libcxx/include/__algorithm/partial_sort.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
8787
void
8888
partial_sort(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last)
8989
{
90-
_VSTD::partial_sort(__first, __middle, __last, __less<>());
90+
std::partial_sort(__first, __middle, __last, __less<>());
9191
}
9292

9393
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/partial_sort_copy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ _RandomAccessIterator
7979
partial_sort_copy(_InputIterator __first, _InputIterator __last,
8080
_RandomAccessIterator __result_first, _RandomAccessIterator __result_last)
8181
{
82-
return _VSTD::partial_sort_copy(__first, __last, __result_first, __result_last, __less<>());
82+
return std::partial_sort_copy(__first, __last, __result_first, __result_last, __less<>());
8383
}
8484

8585
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/partition_point.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
2626
partition_point(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
2727
{
2828
typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;
29-
difference_type __len = _VSTD::distance(__first, __last);
29+
difference_type __len = std::distance(__first, __last);
3030
while (__len != 0)
3131
{
32-
difference_type __l2 = _VSTD::__half_positive(__len);
32+
difference_type __l2 = std::__half_positive(__len);
3333
_ForwardIterator __m = __first;
34-
_VSTD::advance(__m, __l2);
34+
std::advance(__m, __l2);
3535
if (__pred(*__m))
3636
{
3737
__first = ++__m;

‎libcxx/include/__algorithm/prev_permutation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
7070
bool
7171
prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last)
7272
{
73-
return _VSTD::prev_permutation(__first, __last, __less<>());
73+
return std::prev_permutation(__first, __last, __less<>());
7474
}
7575

7676
_LIBCPP_END_NAMESPACE_STD

0 commit comments

Comments
 (0)