commit 25a78dcd773ce509469a2b892adbeac0c230cdb9
author Marshall Clow <mclow.lists@gmail.com> Mon Aug 28 23:16:13 2017 +0000
committer Marshall Clow <mclow.lists@gmail.com> Mon Aug 28 23:16:13 2017 +0000
tree 13e0b568dbf09c7af809ec83f6998b2521df5d4e
parent e8c8bc94334771877d0ec962da5fb9d5b35cd85b

Fix PR31166: std::inplace_merge seems to be unstable. Thanks to Jan Wilken Dörrie for the suggested fix.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@311952 91177308-0d34-0410-b5e6-96231b3b80d8

include/algorithm

diff --git a/include/algorithm b/include/algorithm
index 4542275..31df79f 100644
--- a/include/algorithm
+++ b/include/algorithm
@@ -734,15 +734,15 @@
 };
 
 template <class _Predicate>
-class __negate
+class __invert // invert the sense of a comparison
 {
 private:
     _Predicate __p_;
 public:
-    _LIBCPP_INLINE_VISIBILITY __negate() {}
+    _LIBCPP_INLINE_VISIBILITY __invert() {}
 
     _LIBCPP_INLINE_VISIBILITY
-    explicit __negate(_Predicate __p) : __p_(__p) {}
+    explicit __invert(_Predicate __p) : __p_(__p) {}
 
     template <class _T1>
     _LIBCPP_INLINE_VISIBILITY
@@ -750,7 +750,7 @@
 
     template <class _T1, class _T2>
     _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _T1& __x, const _T2& __y) {return !__p_(__x, __y);}
+    bool operator()(const _T1& __x, const _T2& __y) {return __p_(__y, __x);}
 };
 
 #ifdef _LIBCPP_DEBUG
@@ -4567,7 +4567,7 @@
         typedef reverse_iterator<value_type*> _Rv;
         __half_inplace_merge(_Rv(__p), _Rv(__buff),
                              _RBi(__middle), _RBi(__first),
-                             _RBi(__last), __negate<_Compare>(__comp));
+                             _RBi(__last), __invert<_Compare>(__comp));
     }
 }