diff options
| author | A. Jiang <de34@live.cn> | 2025-03-20 01:59:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-20 01:59:32 +0800 |
| commit | 053a714adda3e1d3d506f417c7fbc6eb3fa75405 (patch) | |
| tree | 7c80bdc344a04e4ba2814ad446be372b018c6441 /libcxx/include/__algorithm | |
| parent | 825460a7728662d0062405e690485b7a1b689484 (diff) | |
[libc++] Implement part of P2562R1: constexpr `ranges::inplace_merge` (#131947)
Drive-by changes:
- Consistently mark `std::__inplace_merge::__inplace_merge_impl`
`_LIBCPP_CONSTEXPR_SINCE_CXX26`.
- This function template is only called by other functions that becomes
constexpr since C++26, and it itself calls `std::__inplace_merge` that
is constexpr since C++26.
- Unblock related test coverage in constant evaluation for
`stable_partition`, `ranges::stable_sort`, `std::stable_sort`,
`std::stable_partition`, and `std::inplace_merge`.
Diffstat (limited to 'libcxx/include/__algorithm')
| -rw-r--r-- | libcxx/include/__algorithm/ranges_inplace_merge.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/__algorithm/ranges_inplace_merge.h b/libcxx/include/__algorithm/ranges_inplace_merge.h index 5879d0e7ef0f..54581aff396e 100644 --- a/libcxx/include/__algorithm/ranges_inplace_merge.h +++ b/libcxx/include/__algorithm/ranges_inplace_merge.h @@ -41,7 +41,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD namespace ranges { struct __inplace_merge { template <class _Iter, class _Sent, class _Comp, class _Proj> - _LIBCPP_HIDE_FROM_ABI static constexpr auto + _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_SINCE_CXX26 auto __inplace_merge_impl(_Iter __first, _Iter __middle, _Sent __last, _Comp&& __comp, _Proj&& __proj) { auto __last_iter = ranges::next(__middle, __last); std::__inplace_merge<_RangeAlgPolicy>( @@ -51,7 +51,7 @@ struct __inplace_merge { template <bidirectional_iterator _Iter, sentinel_for<_Iter> _Sent, class _Comp = ranges::less, class _Proj = identity> requires sortable<_Iter, _Comp, _Proj> - _LIBCPP_HIDE_FROM_ABI _Iter + _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _Iter operator()(_Iter __first, _Iter __middle, _Sent __last, _Comp __comp = {}, _Proj __proj = {}) const { return __inplace_merge_impl( std::move(__first), std::move(__middle), std::move(__last), std::move(__comp), std::move(__proj)); @@ -59,7 +59,7 @@ struct __inplace_merge { template <bidirectional_range _Range, class _Comp = ranges::less, class _Proj = identity> requires sortable<iterator_t<_Range>, _Comp, _Proj> - _LIBCPP_HIDE_FROM_ABI borrowed_iterator_t<_Range> + _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 borrowed_iterator_t<_Range> operator()(_Range&& __range, iterator_t<_Range> __middle, _Comp __comp = {}, _Proj __proj = {}) const { return __inplace_merge_impl( ranges::begin(__range), std::move(__middle), ranges::end(__range), std::move(__comp), std::move(__proj)); |
