From c5439a424205cfbbbbd17f528f5df4d83eee1e6f Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Mon, 27 Feb 2023 11:05:33 -0800 Subject: [PATCH 1/2] Drop top-level const on value parameters in _ExPo declarations. --- stl/inc/algorithm | 38 +++++++++++++++++--------------------- stl/inc/memory | 2 +- stl/inc/numeric | 18 +++++++++--------- stl/inc/xutility | 10 +++++----- 4 files changed, 32 insertions(+), 36 deletions(-) diff --git a/stl/inc/algorithm b/stl/inc/algorithm index 7fc01e3cc4a..bf81ea62595 100644 --- a/stl/inc/algorithm +++ b/stl/inc/algorithm @@ -358,7 +358,7 @@ namespace ranges { #if _HAS_CXX17 _EXPORT_STD template = 0> -_NODISCARD _FwdIt find_if(_ExPo&& _Exec, _FwdIt _First, const _FwdIt _Last, _Pr _Pred) noexcept; // terminates +_NODISCARD _FwdIt find_if(_ExPo&& _Exec, _FwdIt _First, _FwdIt _Last, _Pr _Pred) noexcept; // terminates #endif // _HAS_CXX17 _EXPORT_STD template @@ -495,8 +495,7 @@ _NODISCARD _CONSTEXPR20 _Iter_diff_t<_InIt> count_if(_InIt _First, _InIt _Last, #if _HAS_CXX17 _EXPORT_STD template = 0> -_NODISCARD _Iter_diff_t<_FwdIt> count_if( - _ExPo&& _Exec, const _FwdIt _First, const _FwdIt _Last, _Pr _Pred) noexcept; // terminates +_NODISCARD _Iter_diff_t<_FwdIt> count_if(_ExPo&& _Exec, _FwdIt _First, _FwdIt _Last, _Pr _Pred) noexcept; // terminates #endif // _HAS_CXX17 #ifdef __cpp_lib_concepts @@ -1184,7 +1183,7 @@ _NODISCARD _CONSTEXPR20 bool any_of(const _InIt _First, const _InIt _Last, _Pr _ #if _HAS_CXX17 _EXPORT_STD template = 0> -_NODISCARD bool any_of(_ExPo&&, const _FwdIt _First, const _FwdIt _Last, _Pr _Pred) noexcept; // terminates +_NODISCARD bool any_of(_ExPo&&, _FwdIt _First, _FwdIt _Last, _Pr _Pred) noexcept; // terminates #endif // _HAS_CXX17 #ifdef __cpp_lib_concepts @@ -1246,7 +1245,7 @@ _NODISCARD _CONSTEXPR20 bool none_of(const _InIt _First, const _InIt _Last, _Pr #if _HAS_CXX17 _EXPORT_STD template = 0> -_NODISCARD bool none_of(_ExPo&&, const _FwdIt _First, const _FwdIt _Last, _Pr _Pred) noexcept; // terminates +_NODISCARD bool none_of(_ExPo&&, _FwdIt _First, _FwdIt _Last, _Pr _Pred) noexcept; // terminates #endif // _HAS_CXX17 #ifdef __cpp_lib_concepts @@ -1730,7 +1729,7 @@ _NODISCARD _CONSTEXPR20 bool is_partitioned(const _InIt _First, const _InIt _Las #if _HAS_CXX17 _EXPORT_STD template = 0> -_NODISCARD bool is_partitioned(_ExPo&&, const _FwdIt _First, const _FwdIt _Last, _Pr _Pred) noexcept; // terminates +_NODISCARD bool is_partitioned(_ExPo&&, _FwdIt _First, _FwdIt _Last, _Pr _Pred) noexcept; // terminates #endif // _HAS_CXX17 #ifdef __cpp_lib_concepts @@ -1974,8 +1973,8 @@ _NODISCARD _CONSTEXPR20 _FwdItHaystack search(_FwdItHaystack _First1, _FwdItHays #if _HAS_CXX17 _EXPORT_STD template = 0> -_NODISCARD _FwdItHaystack search(_ExPo&& _Exec, const _FwdItHaystack _First1, _FwdItHaystack _Last1, - const _FwdItPat _First2, const _FwdItPat _Last2, _Pr _Pred) noexcept; // terminates +_NODISCARD _FwdItHaystack search(_ExPo&& _Exec, _FwdItHaystack _First1, _FwdItHaystack _Last1, _FwdItPat _First2, + _FwdItPat _Last2, _Pr _Pred) noexcept; // terminates #endif // _HAS_CXX17 _EXPORT_STD template @@ -2076,7 +2075,7 @@ _NODISCARD _CONSTEXPR20 _FwdIt search_n( #if _HAS_CXX17 _EXPORT_STD template = 0> -_NODISCARD _FwdIt search_n(_ExPo&& _Exec, const _FwdIt _First, _FwdIt _Last, const _Diff _Count_raw, const _Ty& _Val, +_NODISCARD _FwdIt search_n(_ExPo&& _Exec, _FwdIt _First, _FwdIt _Last, _Diff _Count_raw, const _Ty& _Val, _Pr _Pred) noexcept; // terminates #endif // _HAS_CXX17 @@ -3246,8 +3245,8 @@ _NODISCARD _CONSTEXPR20 _FwdIt1 find_first_of(const _FwdIt1 _First1, const _FwdI #if _HAS_CXX17 _EXPORT_STD template = 0> -_NODISCARD _FwdIt1 find_first_of(_ExPo&& _Exec, const _FwdIt1 _First1, _FwdIt1 _Last1, const _FwdIt2 _First2, - const _FwdIt2 _Last2, _Pr _Pred) noexcept; // terminates +_NODISCARD _FwdIt1 find_first_of( + _ExPo&& _Exec, _FwdIt1 _First1, _FwdIt1 _Last1, _FwdIt2 _First2, _FwdIt2 _Last2, _Pr _Pred) noexcept; // terminates _EXPORT_STD template = 0> _NODISCARD _FwdIt1 find_first_of(_ExPo&& _Exec, const _FwdIt1 _First1, const _FwdIt1 _Last1, const _FwdIt2 _First2, @@ -3448,8 +3447,7 @@ _CONSTEXPR20 _OutIt transform(const _InIt _First, const _InIt _Last, _OutIt _Des #if _HAS_CXX17 _EXPORT_STD template = 0> -_FwdIt2 transform( - _ExPo&& _Exec, const _FwdIt1 _First, const _FwdIt1 _Last, _FwdIt2 _Dest, _Fn _Func) noexcept; // terminates +_FwdIt2 transform(_ExPo&& _Exec, _FwdIt1 _First, _FwdIt1 _Last, _FwdIt2 _Dest, _Fn _Func) noexcept; // terminates #endif // _HAS_CXX17 _EXPORT_STD template @@ -3473,7 +3471,7 @@ _CONSTEXPR20 _OutIt transform( #if _HAS_CXX17 _EXPORT_STD template = 0> -_FwdIt3 transform(_ExPo&& _Exec, const _FwdIt1 _First1, const _FwdIt1 _Last1, const _FwdIt2 _First2, _FwdIt3 _Dest, +_FwdIt3 transform(_ExPo&& _Exec, _FwdIt1 _First1, _FwdIt1 _Last1, _FwdIt2 _First2, _FwdIt3 _Dest, _Fn _Func) noexcept; // terminates #endif // _HAS_CXX17 @@ -3601,7 +3599,7 @@ _CONSTEXPR20 void replace(const _FwdIt _First, const _FwdIt _Last, const _Ty& _O #if _HAS_CXX17 _EXPORT_STD template = 0> -void replace(_ExPo&& _Exec, const _FwdIt _First, const _FwdIt _Last, const _Ty& _Oldval, +void replace(_ExPo&& _Exec, _FwdIt _First, _FwdIt _Last, const _Ty& _Oldval, const _Ty& _Newval) noexcept; // terminates #endif // _HAS_CXX17 @@ -4138,12 +4136,10 @@ _FwdIt2 remove_copy_if(_ExPo&&, _FwdIt1 _First, _FwdIt1 _Last, _FwdIt2 _Dest, _P #if _HAS_CXX17 _EXPORT_STD template = 0> -_NODISCARD_REMOVE_ALG _FwdIt remove( - _ExPo&& _Exec, const _FwdIt _First, const _FwdIt _Last, const _Ty& _Val) noexcept; // terminates +_NODISCARD_REMOVE_ALG _FwdIt remove(_ExPo&& _Exec, _FwdIt _First, _FwdIt _Last, const _Ty& _Val) noexcept; // terminates _EXPORT_STD template = 0> -_NODISCARD_REMOVE_ALG _FwdIt remove_if( - _ExPo&& _Exec, _FwdIt _First, const _FwdIt _Last, _Pr _Pred) noexcept; // terminates +_NODISCARD_REMOVE_ALG _FwdIt remove_if(_ExPo&& _Exec, _FwdIt _First, _FwdIt _Last, _Pr _Pred) noexcept; // terminates #endif // _HAS_CXX17 #ifdef __cpp_lib_concepts @@ -5865,7 +5861,7 @@ _CONSTEXPR20 _FwdIt partition(_FwdIt _First, const _FwdIt _Last, _Pr _Pred) { #if _HAS_CXX17 _EXPORT_STD template = 0> -_FwdIt partition(_ExPo&& _Exec, _FwdIt _First, const _FwdIt _Last, _Pr _Pred) noexcept; // terminates +_FwdIt partition(_ExPo&& _Exec, _FwdIt _First, _FwdIt _Last, _Pr _Pred) noexcept; // terminates #ifdef __cpp_lib_concepts namespace ranges { @@ -8478,7 +8474,7 @@ void stable_sort(const _BidIt _First, const _BidIt _Last, _Pr _Pred) { #if _HAS_CXX17 _EXPORT_STD template = 0> -void stable_sort(_ExPo&& _Exec, const _BidIt _First, const _BidIt _Last, _Pr _Pred) noexcept; // terminates +void stable_sort(_ExPo&& _Exec, _BidIt _First, _BidIt _Last, _Pr _Pred) noexcept; // terminates #endif // _HAS_CXX17 _EXPORT_STD template diff --git a/stl/inc/memory b/stl/inc/memory index 3ddb1c45401..2fd0f363359 100644 --- a/stl/inc/memory +++ b/stl/inc/memory @@ -898,7 +898,7 @@ _NoThrowFwdIt uninitialized_value_construct_n(_NoThrowFwdIt _First, const _Diff _EXPORT_STD template = 0> _NoThrowFwdIt uninitialized_value_construct_n( - _ExPo&& _Exec, _NoThrowFwdIt _First, const _Diff _Count_raw) noexcept; // terminates + _ExPo&& _Exec, _NoThrowFwdIt _First, _Diff _Count_raw) noexcept; // terminates #ifdef __cpp_lib_concepts namespace ranges { diff --git a/stl/inc/numeric b/stl/inc/numeric index 3eb15576da1..7ec24b23785 100644 --- a/stl/inc/numeric +++ b/stl/inc/numeric @@ -236,7 +236,7 @@ _NODISCARD _Ty transform_reduce(_ExPo&& _Exec, _FwdIt1 _First1, _FwdIt1 _Last1, _EXPORT_STD template = 0> -_NODISCARD _Ty transform_reduce(_ExPo&& _Exec, const _FwdIt _First1, const _FwdIt _Last1, _Ty _Val, _BinOp _Reduce_op, +_NODISCARD _Ty transform_reduce(_ExPo&& _Exec, _FwdIt _First1, _FwdIt _Last1, _Ty _Val, _BinOp _Reduce_op, _UnaryOp _Transform_op) noexcept; // terminates #endif // _HAS_CXX17 @@ -309,7 +309,7 @@ _CONSTEXPR20 _OutIt exclusive_scan(const _InIt _First, const _InIt _Last, const _EXPORT_STD template = 0> -_FwdIt2 exclusive_scan(_ExPo&& _Exec, const _FwdIt1 _First, const _FwdIt1 _Last, _FwdIt2 _Dest, _Ty _Val, +_FwdIt2 exclusive_scan(_ExPo&& _Exec, _FwdIt1 _First, _FwdIt1 _Last, _FwdIt2 _Dest, _Ty _Val, _BinOp _Reduce_op) noexcept; // terminates _EXPORT_STD template = 0> @@ -411,8 +411,8 @@ _CONSTEXPR20 _OutIt transform_exclusive_scan( _EXPORT_STD template = 0> -_OutIt transform_exclusive_scan(_ExPo&& _Exec, const _FwdIt1 _First, const _FwdIt1 _Last, _OutIt _Dest, _Ty _Val, - _BinOp _Reduce_op, _UnaryOp _Transform_op) noexcept; // terminates +_OutIt transform_exclusive_scan(_ExPo&& _Exec, _FwdIt1 _First, _FwdIt1 _Last, _OutIt _Dest, _Ty _Val, _BinOp _Reduce_op, + _UnaryOp _Transform_op) noexcept; // terminates _EXPORT_STD template _CONSTEXPR20 _OutIt transform_inclusive_scan( @@ -460,13 +460,13 @@ _CONSTEXPR20 _OutIt transform_inclusive_scan( _EXPORT_STD template = 0> -_FwdIt2 transform_inclusive_scan(_ExPo&& _Exec, const _FwdIt1 _First, const _FwdIt1 _Last, _FwdIt2 _Dest, - _BinOp _Reduce_op, _UnaryOp _Transform_op, _Ty _Val) noexcept; // terminates +_FwdIt2 transform_inclusive_scan(_ExPo&& _Exec, _FwdIt1 _First, _FwdIt1 _Last, _FwdIt2 _Dest, _BinOp _Reduce_op, + _UnaryOp _Transform_op, _Ty _Val) noexcept; // terminates _EXPORT_STD template = 0> -_FwdIt2 transform_inclusive_scan(_ExPo&& _Exec, const _FwdIt1 _First, const _FwdIt1 _Last, _FwdIt2 _Dest, - _BinOp _Reduce_op, _UnaryOp _Transform_op) noexcept; // terminates +_FwdIt2 transform_inclusive_scan(_ExPo&& _Exec, _FwdIt1 _First, _FwdIt1 _Last, _FwdIt2 _Dest, _BinOp _Reduce_op, + _UnaryOp _Transform_op) noexcept; // terminates #endif // _HAS_CXX17 _EXPORT_STD template @@ -505,7 +505,7 @@ _CONSTEXPR20 _OutIt adjacent_difference(const _InIt _First, const _InIt _Last, c #if _HAS_CXX17 _EXPORT_STD template = 0> _FwdIt2 adjacent_difference( - _ExPo&& _Exec, const _FwdIt1 _First, const _FwdIt1 _Last, _FwdIt2 _Dest, _BinOp _Diff_op) noexcept; // terminates + _ExPo&& _Exec, _FwdIt1 _First, _FwdIt1 _Last, _FwdIt2 _Dest, _BinOp _Diff_op) noexcept; // terminates _EXPORT_STD template = 0> _FwdIt2 adjacent_difference(_ExPo&& _Exec, const _FwdIt1 _First, const _FwdIt1 _Last, const _FwdIt2 _Dest) noexcept diff --git a/stl/inc/xutility b/stl/inc/xutility index 74782010400..42d7a3b1718 100644 --- a/stl/inc/xutility +++ b/stl/inc/xutility @@ -5211,7 +5211,7 @@ _NODISCARD _CONSTEXPR20 bool equal(const _InIt1 _First1, const _InIt1 _Last1, co #if _HAS_CXX17 _EXPORT_STD template = 0> -_NODISCARD bool equal(_ExPo&& _Exec, const _FwdIt1 _First1, const _FwdIt1 _Last1, const _FwdIt2 _First2, +_NODISCARD bool equal(_ExPo&& _Exec, _FwdIt1 _First1, _FwdIt1 _Last1, _FwdIt2 _First2, _Pr _Pred) noexcept; // terminates #endif // _HAS_CXX17 @@ -5268,8 +5268,8 @@ _NODISCARD _CONSTEXPR20 bool equal( #if _HAS_CXX17 _EXPORT_STD template = 0> -_NODISCARD bool equal(_ExPo&& _Exec, const _FwdIt1 _First1, const _FwdIt1 _Last1, const _FwdIt2 _First2, - const _FwdIt2 _Last2, _Pr _Pred) noexcept; // terminates +_NODISCARD bool equal( + _ExPo&& _Exec, _FwdIt1 _First1, _FwdIt1 _Last1, _FwdIt2 _First2, _FwdIt2 _Last2, _Pr _Pred) noexcept; // terminates #endif // _HAS_CXX17 _EXPORT_STD template @@ -5785,7 +5785,7 @@ _NODISCARD _CONSTEXPR20 _InIt find(_InIt _First, const _InIt _Last, const _Ty& _ #if _HAS_CXX17 _EXPORT_STD template = 0> -_NODISCARD _FwdIt find(_ExPo&& _Exec, _FwdIt _First, const _FwdIt _Last, const _Ty& _Val) noexcept; // terminates +_NODISCARD _FwdIt find(_ExPo&& _Exec, _FwdIt _First, _FwdIt _Last, const _Ty& _Val) noexcept; // terminates #endif // _HAS_CXX17 #ifdef __cpp_lib_concepts @@ -5948,7 +5948,7 @@ _NODISCARD _CONSTEXPR20 _Iter_diff_t<_InIt> count(const _InIt _First, const _InI #if _HAS_CXX17 _EXPORT_STD template = 0> _NODISCARD _Iter_diff_t<_FwdIt> count( - _ExPo&& _Exec, const _FwdIt _First, const _FwdIt _Last, const _Ty& _Val) noexcept; // terminates + _ExPo&& _Exec, _FwdIt _First, _FwdIt _Last, const _Ty& _Val) noexcept; // terminates #endif // _HAS_CXX17 template From 73433f8ccd9584b55fc87ed8fab0c1c7283bca50 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Fri, 3 Mar 2023 04:21:33 -0800 Subject: [PATCH 2/2] Drop more top-level const on value parameters in declarations. --- stl/inc/algorithm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stl/inc/algorithm b/stl/inc/algorithm index bf81ea62595..ce0a039bb16 100644 --- a/stl/inc/algorithm +++ b/stl/inc/algorithm @@ -7409,7 +7409,7 @@ void _Inplace_merge_buffer_right( template void _Buffered_inplace_merge_unchecked(_BidIt _First, _BidIt _Mid, _BidIt _Last, _Iter_diff_t<_BidIt> _Count1, - _Iter_diff_t<_BidIt> _Count2, _Iter_value_t<_BidIt>* const _Temp_ptr, const ptrdiff_t _Capacity, _Pr _Pred); + _Iter_diff_t<_BidIt> _Count2, _Iter_value_t<_BidIt>* _Temp_ptr, ptrdiff_t _Capacity, _Pr _Pred); template void _Buffered_inplace_merge_divide_and_conquer2(_BidIt _First, _BidIt _Mid, _BidIt _Last, _Iter_diff_t<_BidIt> _Count1,