diff options
| author | AlexSm <[email protected]> | 2024-01-19 17:48:10 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-01-19 17:48:10 +0100 |
| commit | 5722bbf18aa2f471fc5491834c6c877b524e8795 (patch) | |
| tree | 0bfe53383cc4dc38261e3e0086af199f39777801 /contrib/libs/cxxsupp/libcxx/include/__algorithm/ranges_merge.h | |
| parent | 610b3da211be5d7cfd27077f22b876aedaa2dc29 (diff) | |
Library update 9 (#1163)
* Right libs import scripts
* Library update 9
* Add contrib/libs/cxxsupp/libcxx/include/memory_resource
Diffstat (limited to 'contrib/libs/cxxsupp/libcxx/include/__algorithm/ranges_merge.h')
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/__algorithm/ranges_merge.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/include/__algorithm/ranges_merge.h b/contrib/libs/cxxsupp/libcxx/include/__algorithm/ranges_merge.h index eb621c2351d..b36a05abc41 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__algorithm/ranges_merge.h +++ b/contrib/libs/cxxsupp/libcxx/include/__algorithm/ranges_merge.h @@ -27,7 +27,7 @@ # pragma GCC system_header #endif -#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) +#if _LIBCPP_STD_VER > 17 _LIBCPP_BEGIN_NAMESPACE_STD @@ -47,7 +47,7 @@ template < class _Comp, class _Proj1, class _Proj2> -_LIBCPP_HIDE_FROM_ABI constexpr merge_result<__uncvref_t<_InIter1>, __uncvref_t<_InIter2>, __uncvref_t<_OutIter>> +_LIBCPP_HIDE_FROM_ABI constexpr merge_result<__remove_cvref_t<_InIter1>, __remove_cvref_t<_InIter2>, __remove_cvref_t<_OutIter>> __merge_impl( _InIter1&& __first1, _Sent1&& __last1, @@ -137,6 +137,6 @@ inline namespace __cpo { _LIBCPP_END_NAMESPACE_STD -#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) +#endif // _LIBCPP_STD_VER > 17 #endif // _LIBCPP___ALGORITHM_RANGES_MERGE_H |