diff options
author | Louis Dionne <ldionne.2@gmail.com> | 2023-12-05 11:19:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-05 11:19:15 -0500 |
commit | 77a00c0d546cd4aa8311b5b9031ae9ea8cdb050c (patch) | |
tree | 82bad056915baffbe04f339d980118bd904ce403 /libcxx/include/__numeric | |
parent | c568927f3e2e7d9804ea74ecbf11c16c014ddcbc (diff) | |
download | llvm-77a00c0d546cd4aa8311b5b9031ae9ea8cdb050c.zip llvm-77a00c0d546cd4aa8311b5b9031ae9ea8cdb050c.tar.gz llvm-77a00c0d546cd4aa8311b5b9031ae9ea8cdb050c.tar.bz2 |
[libc++] Replace uses of _VSTD:: by std:: (#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.
Diffstat (limited to 'libcxx/include/__numeric')
-rw-r--r-- | libcxx/include/__numeric/accumulate.h | 4 | ||||
-rw-r--r-- | libcxx/include/__numeric/adjacent_difference.h | 8 | ||||
-rw-r--r-- | libcxx/include/__numeric/exclusive_scan.h | 6 | ||||
-rw-r--r-- | libcxx/include/__numeric/gcd_lcm.h | 6 | ||||
-rw-r--r-- | libcxx/include/__numeric/inclusive_scan.h | 4 | ||||
-rw-r--r-- | libcxx/include/__numeric/inner_product.h | 4 | ||||
-rw-r--r-- | libcxx/include/__numeric/midpoint.h | 2 | ||||
-rw-r--r-- | libcxx/include/__numeric/partial_sum.h | 4 | ||||
-rw-r--r-- | libcxx/include/__numeric/reduce.h | 4 | ||||
-rw-r--r-- | libcxx/include/__numeric/transform_inclusive_scan.h | 2 | ||||
-rw-r--r-- | libcxx/include/__numeric/transform_reduce.h | 4 |
11 files changed, 24 insertions, 24 deletions
diff --git a/libcxx/include/__numeric/accumulate.h b/libcxx/include/__numeric/accumulate.h index 3a1bfbe..1ab6c4b 100644 --- a/libcxx/include/__numeric/accumulate.h +++ b/libcxx/include/__numeric/accumulate.h @@ -29,7 +29,7 @@ accumulate(_InputIterator __first, _InputIterator __last, _Tp __init) { for (; __first != __last; ++__first) #if _LIBCPP_STD_VER >= 20 - __init = _VSTD::move(__init) + *__first; + __init = std::move(__init) + *__first; #else __init = __init + *__first; #endif @@ -43,7 +43,7 @@ accumulate(_InputIterator __first, _InputIterator __last, _Tp __init, _BinaryOpe { for (; __first != __last; ++__first) #if _LIBCPP_STD_VER >= 20 - __init = __binary_op(_VSTD::move(__init), *__first); + __init = __binary_op(std::move(__init), *__first); #else __init = __binary_op(__init, *__first); #endif diff --git a/libcxx/include/__numeric/adjacent_difference.h b/libcxx/include/__numeric/adjacent_difference.h index 9142a85..31ffe9c 100644 --- a/libcxx/include/__numeric/adjacent_difference.h +++ b/libcxx/include/__numeric/adjacent_difference.h @@ -36,11 +36,11 @@ adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterat { typename iterator_traits<_InputIterator>::value_type __val(*__first); #if _LIBCPP_STD_VER >= 20 - *__result = __val - _VSTD::move(__acc); + *__result = __val - std::move(__acc); #else *__result = __val - __acc; #endif - __acc = _VSTD::move(__val); + __acc = std::move(__val); } } return __result; @@ -60,11 +60,11 @@ adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterat { typename iterator_traits<_InputIterator>::value_type __val(*__first); #if _LIBCPP_STD_VER >= 20 - *__result = __binary_op(__val, _VSTD::move(__acc)); + *__result = __binary_op(__val, std::move(__acc)); #else *__result = __binary_op(__val, __acc); #endif - __acc = _VSTD::move(__val); + __acc = std::move(__val); } } return __result; diff --git a/libcxx/include/__numeric/exclusive_scan.h b/libcxx/include/__numeric/exclusive_scan.h index 7229171..8b4a5c8 100644 --- a/libcxx/include/__numeric/exclusive_scan.h +++ b/libcxx/include/__numeric/exclusive_scan.h @@ -31,12 +31,12 @@ exclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __ if (__first != __last) { _Tp __tmp(__b(__init, *__first)); while (true) { - *__result = _VSTD::move(__init); + *__result = std::move(__init); ++__result; ++__first; if (__first == __last) break; - __init = _VSTD::move(__tmp); + __init = std::move(__tmp); __tmp = __b(__init, *__first); } } @@ -46,7 +46,7 @@ exclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __ template <class _InputIterator, class _OutputIterator, class _Tp> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator exclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _Tp __init) { - return _VSTD::exclusive_scan(__first, __last, __result, __init, _VSTD::plus<>()); + return std::exclusive_scan(__first, __last, __result, __init, std::plus<>()); } #endif // _LIBCPP_STD_VER >= 17 diff --git a/libcxx/include/__numeric/gcd_lcm.h b/libcxx/include/__numeric/gcd_lcm.h index 2287920..693be70 100644 --- a/libcxx/include/__numeric/gcd_lcm.h +++ b/libcxx/include/__numeric/gcd_lcm.h @@ -55,7 +55,7 @@ _LIBCPP_CONSTEXPR _LIBCPP_HIDDEN _Tp __gcd(_Tp __m, _Tp __n) { static_assert((!is_signed<_Tp>::value), ""); - return __n == 0 ? __m : _VSTD::__gcd<_Tp>(__n, __m % __n); + return __n == 0 ? __m : std::__gcd<_Tp>(__n, __m % __n); } template<class _Tp, class _Up> @@ -68,7 +68,7 @@ gcd(_Tp __m, _Up __n) static_assert((!is_same<__remove_cv_t<_Up>, bool>::value), "Second argument to gcd cannot be bool" ); using _Rp = common_type_t<_Tp,_Up>; using _Wp = make_unsigned_t<_Rp>; - return static_cast<_Rp>(_VSTD::__gcd( + return static_cast<_Rp>(std::__gcd( static_cast<_Wp>(__ct_abs<_Rp, _Tp>()(__m)), static_cast<_Wp>(__ct_abs<_Rp, _Up>()(__n)))); } @@ -85,7 +85,7 @@ lcm(_Tp __m, _Up __n) return 0; using _Rp = common_type_t<_Tp,_Up>; - _Rp __val1 = __ct_abs<_Rp, _Tp>()(__m) / _VSTD::gcd(__m, __n); + _Rp __val1 = __ct_abs<_Rp, _Tp>()(__m) / std::gcd(__m, __n); _Rp __val2 = __ct_abs<_Rp, _Up>()(__n); _LIBCPP_ASSERT_UNCATEGORIZED((numeric_limits<_Rp>::max() / __val1 > __val2), "Overflow in lcm"); return __val1 * __val2; diff --git a/libcxx/include/__numeric/inclusive_scan.h b/libcxx/include/__numeric/inclusive_scan.h index b6d72af..162b9e6 100644 --- a/libcxx/include/__numeric/inclusive_scan.h +++ b/libcxx/include/__numeric/inclusive_scan.h @@ -40,7 +40,7 @@ inclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __ typename iterator_traits<_InputIterator>::value_type __init = *__first; *__result++ = __init; if (++__first != __last) - return _VSTD::inclusive_scan(__first, __last, __result, __b, __init); + return std::inclusive_scan(__first, __last, __result, __b, __init); } return __result; @@ -50,7 +50,7 @@ template <class _InputIterator, class _OutputIterator> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator inclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __result) { - return _VSTD::inclusive_scan(__first, __last, __result, _VSTD::plus<>()); + return std::inclusive_scan(__first, __last, __result, std::plus<>()); } #endif // _LIBCPP_STD_VER >= 17 diff --git a/libcxx/include/__numeric/inner_product.h b/libcxx/include/__numeric/inner_product.h index c9476c5..48f2ea3 100644 --- a/libcxx/include/__numeric/inner_product.h +++ b/libcxx/include/__numeric/inner_product.h @@ -29,7 +29,7 @@ inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 { for (; __first1 != __last1; ++__first1, (void) ++__first2) #if _LIBCPP_STD_VER >= 20 - __init = _VSTD::move(__init) + *__first1 * *__first2; + __init = std::move(__init) + *__first1 * *__first2; #else __init = __init + *__first1 * *__first2; #endif @@ -44,7 +44,7 @@ inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 { for (; __first1 != __last1; ++__first1, (void) ++__first2) #if _LIBCPP_STD_VER >= 20 - __init = __binary_op1(_VSTD::move(__init), __binary_op2(*__first1, *__first2)); + __init = __binary_op1(std::move(__init), __binary_op2(*__first1, *__first2)); #else __init = __binary_op1(__init, __binary_op2(*__first1, *__first2)); #endif diff --git a/libcxx/include/__numeric/midpoint.h b/libcxx/include/__numeric/midpoint.h index 780dfd6..c92e450 100644 --- a/libcxx/include/__numeric/midpoint.h +++ b/libcxx/include/__numeric/midpoint.h @@ -60,7 +60,7 @@ enable_if_t<is_pointer_v<_TPtr> && (sizeof(remove_pointer_t<_TPtr>) > 0), _TPtr> midpoint(_TPtr __a, _TPtr __b) noexcept { - return __a + _VSTD::midpoint(ptrdiff_t(0), __b - __a); + return __a + std::midpoint(ptrdiff_t(0), __b - __a); } diff --git a/libcxx/include/__numeric/partial_sum.h b/libcxx/include/__numeric/partial_sum.h index 6b0cea1..49afcbb 100644 --- a/libcxx/include/__numeric/partial_sum.h +++ b/libcxx/include/__numeric/partial_sum.h @@ -35,7 +35,7 @@ partial_sum(_InputIterator __first, _InputIterator __last, _OutputIterator __res for (++__first, (void) ++__result; __first != __last; ++__first, (void) ++__result) { #if _LIBCPP_STD_VER >= 20 - __t = _VSTD::move(__t) + *__first; + __t = std::move(__t) + *__first; #else __t = __t + *__first; #endif @@ -58,7 +58,7 @@ partial_sum(_InputIterator __first, _InputIterator __last, _OutputIterator __res for (++__first, (void) ++__result; __first != __last; ++__first, (void) ++__result) { #if _LIBCPP_STD_VER >= 20 - __t = __binary_op(_VSTD::move(__t), *__first); + __t = __binary_op(std::move(__t), *__first); #else __t = __binary_op(__t, *__first); #endif diff --git a/libcxx/include/__numeric/reduce.h b/libcxx/include/__numeric/reduce.h index df1b93d..eb53053 100644 --- a/libcxx/include/__numeric/reduce.h +++ b/libcxx/include/__numeric/reduce.h @@ -33,13 +33,13 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp reduce(_InputIterator __ template <class _InputIterator, class _Tp> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp reduce(_InputIterator __first, _InputIterator __last, _Tp __init) { - return _VSTD::reduce(__first, __last, __init, _VSTD::plus<>()); + return std::reduce(__first, __last, __init, std::plus<>()); } template <class _InputIterator> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 typename iterator_traits<_InputIterator>::value_type reduce(_InputIterator __first, _InputIterator __last) { - return _VSTD::reduce(__first, __last, typename iterator_traits<_InputIterator>::value_type{}); + return std::reduce(__first, __last, typename iterator_traits<_InputIterator>::value_type{}); } #endif diff --git a/libcxx/include/__numeric/transform_inclusive_scan.h b/libcxx/include/__numeric/transform_inclusive_scan.h index be153bc..e1b818c 100644 --- a/libcxx/include/__numeric/transform_inclusive_scan.h +++ b/libcxx/include/__numeric/transform_inclusive_scan.h @@ -45,7 +45,7 @@ transform_inclusive_scan(_InputIterator __first, _InputIterator __last, typename iterator_traits<_InputIterator>::value_type __init = __u(*__first); *__result++ = __init; if (++__first != __last) - return _VSTD::transform_inclusive_scan(__first, __last, __result, __b, __u, __init); + return std::transform_inclusive_scan(__first, __last, __result, __b, __u, __init); } return __result; diff --git a/libcxx/include/__numeric/transform_reduce.h b/libcxx/include/__numeric/transform_reduce.h index 05f4884..04d02b6 100644 --- a/libcxx/include/__numeric/transform_reduce.h +++ b/libcxx/include/__numeric/transform_reduce.h @@ -44,8 +44,8 @@ template <class _InputIterator1, class _InputIterator2, class _Tp> _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp transform_reduce(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _Tp __init) { - return _VSTD::transform_reduce(__first1, __last1, __first2, _VSTD::move(__init), _VSTD::plus<>(), - _VSTD::multiplies<>()); + return std::transform_reduce(__first1, __last1, __first2, std::move(__init), std::plus<>(), + std::multiplies<>()); } #endif |