[libcxx-commits] [PATCH] D93562: [libc++] Add a missing `<_Compare>` template argument.
Arthur O'Dwyer via Phabricator via libcxx-commits
libcxx-commits at lists.llvm.org
Tue Jan 12 11:19:15 PST 2021
This revision was automatically updated to reflect the committed changes.
Closed by commit rGeef4bdbb34de: [libc++] Add a missing `<_Compare>` template argument. (authored by arthur.j.odwyer).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D93562/new/
https://reviews.llvm.org/D93562
Files:
libcxx/include/algorithm
Index: libcxx/include/algorithm
===================================================================
--- libcxx/include/algorithm
+++ libcxx/include/algorithm
@@ -4483,7 +4483,7 @@
value_type* __p = __buff;
for (_BidirectionalIterator __i = __first; __i != __middle; __d.template __incr<value_type>(), (void) ++__i, (void) ++__p)
::new ((void*)__p) value_type(_VSTD::move(*__i));
- _VSTD::__half_inplace_merge(__buff, __p, __middle, __last, __first, __comp);
+ _VSTD::__half_inplace_merge<_Compare>(__buff, __p, __middle, __last, __first, __comp);
}
else
{
@@ -4492,9 +4492,10 @@
::new ((void*)__p) value_type(_VSTD::move(*__i));
typedef reverse_iterator<_BidirectionalIterator> _RBi;
typedef reverse_iterator<value_type*> _Rv;
- _VSTD::__half_inplace_merge(_Rv(__p), _Rv(__buff),
+ typedef __invert<_Compare> _Inverted;
+ _VSTD::__half_inplace_merge<_Inverted>(_Rv(__p), _Rv(__buff),
_RBi(__middle), _RBi(__first),
- _RBi(__last), _VSTD::__invert<_Compare>(__comp));
+ _RBi(__last), _Inverted(__comp));
}
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D93562.316170.patch
Type: text/x-patch
Size: 1234 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20210112/d58fb93c/attachment-0001.bin>
More information about the libcxx-commits
mailing list