mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-03 11:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Release Cosmopolitan v3.6.0

Browse source 
This release is an atomic upgrade to GCC 14.1.0 with C23 and C++23
This commit is contained in:
Justine Tunney 2024-07-23 03:16:17 -07:00
parent 62ace3623a
commit 5660ec4741
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
1585 changed files with 117353 additions and 271644 deletions
Download patch file Download diff file Expand all files Collapse all files

96
third_party/libcxx/__algorithm/ranges_merge.h vendored
View file

@ -27,6 +27,9 @@
# pragma GCC system_header
#endif
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
#if _LIBCPP_STD_VER >= 20
_LIBCPP_BEGIN_NAMESPACE_STD
@ -38,25 +41,25 @@ using merge_result = in_in_out_result<_InIter1, _InIter2, _OutIter>;
namespace __merge {
template <
class _InIter1,
class _Sent1,
class _InIter2,
class _Sent2,
class _OutIter,
class _Comp,
class _Proj1,
class _Proj2>
_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,
_InIter2&& __first2,
_Sent2&& __last2,
_OutIter&& __result,
_Comp&& __comp,
_Proj1&& __proj1,
_Proj2&& __proj2) {
template < class _InIter1,
class _Sent1,
class _InIter2,
class _Sent2,
class _OutIter,
class _Comp,
class _Proj1,
class _Proj2>
_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,
_InIter2&& __first2,
_Sent2&& __last2,
_OutIter&& __result,
_Comp&& __comp,
_Proj1&& __proj1,
_Proj2&& __proj2) {
for (; __first1 != __last1 && __first2 != __last2; ++__result) {
if (std::invoke(__comp, std::invoke(__proj2, *__first2), std::invoke(__proj1, *__first1))) {
*__result = *__first2;
@ -72,15 +75,14 @@ __merge_impl(
}
struct __fn {
template <
input_iterator _InIter1,
sentinel_for<_InIter1> _Sent1,
input_iterator _InIter2,
sentinel_for<_InIter2> _Sent2,
weakly_incrementable _OutIter,
class _Comp = less,
class _Proj1 = identity,
class _Proj2 = identity>
template <input_iterator _InIter1,
sentinel_for<_InIter1> _Sent1,
input_iterator _InIter2,
sentinel_for<_InIter2> _Sent2,
weakly_incrementable _OutIter,
class _Comp = less,
class _Proj1 = identity,
class _Proj2 = identity>
requires mergeable<_InIter1, _InIter2, _OutIter, _Comp, _Proj1, _Proj2>
_LIBCPP_HIDE_FROM_ABI constexpr merge_result<_InIter1, _InIter2, _OutIter> operator()(
_InIter1 __first1,
@ -94,28 +96,20 @@ struct __fn {
return __merge::__merge_impl(__first1, __last1, __first2, __last2, __result, __comp, __proj1, __proj2);
}
template <
input_range _Range1,
input_range _Range2,
weakly_incrementable _OutIter,
class _Comp = less,
class _Proj1 = identity,
class _Proj2 = identity>
requires mergeable<
iterator_t<_Range1>,
iterator_t<_Range2>,
_OutIter,
_Comp,
_Proj1,
_Proj2>
template <input_range _Range1,
input_range _Range2,
weakly_incrementable _OutIter,
class _Comp = less,
class _Proj1 = identity,
class _Proj2 = identity>
requires mergeable<iterator_t<_Range1>, iterator_t<_Range2>, _OutIter, _Comp, _Proj1, _Proj2>
_LIBCPP_HIDE_FROM_ABI constexpr merge_result<borrowed_iterator_t<_Range1>, borrowed_iterator_t<_Range2>, _OutIter>
operator()(
_Range1&& __range1,
_Range2&& __range2,
_OutIter __result,
_Comp __comp = {},
_Proj1 __proj1 = {},
_Proj2 __proj2 = {}) const {
operator()(_Range1&& __range1,
_Range2&& __range2,
_OutIter __result,
_Comp __comp = {},
_Proj1 __proj1 = {},
_Proj2 __proj2 = {}) const {
return __merge::__merge_impl(
ranges::begin(__range1),
ranges::end(__range1),
@ -131,7 +125,7 @@ struct __fn {
} // namespace __merge
inline namespace __cpo {
inline constexpr auto merge = __merge::__fn{};
inline constexpr auto merge = __merge::__fn{};
} // namespace __cpo
} // namespace ranges
@ -139,4 +133,6 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
_LIBCPP_POP_MACROS
#endif // _LIBCPP___ALGORITHM_RANGES_MERGE_H