Ticket #2603: owner_before.patch

boost/shared_ptr.hpp

@@ -511 +511 @@
         return pn;
     }
 
-    template<class Y> bool _internal_less(shared_ptr<Y> const & rhs) const
+    template<class Y> bool owner_before(shared_ptr<Y> const & rhs) const
     {
         return pn < rhs.pn;
     }
 
+    template<class Y> bool owner_before(weak_ptr<Y> const & rhs) const
+    {
+        return pn < rhs.pn;
+    }
+
     bool _internal_equiv( shared_ptr const & r ) const
     {
         return px == r.px && pn == r.pn;
@@ -562 +567 @@
 
 template<class T, class U> inline bool operator<(shared_ptr<T> const & a, shared_ptr<U> const & b)
 {
-    return a._internal_less(b);
+    return a.owner_before(b);
 }
 
 template<class T> inline void swap(shared_ptr<T> & a, shared_ptr<T> & b)

boost/weak_ptr.hpp

@@ -141 +141 @@
         pn = pn2;
     }
 
-    template<class Y> bool _internal_less(weak_ptr<Y> const & rhs) const
+    template<class Y> bool owner_before(shared_ptr<Y> const & rhs) const
     {
         return pn < rhs.pn;
     }
 
+    template<class Y> bool owner_before(weak_ptr<Y> const & rhs) const
+    {
+        return pn < rhs.pn;
+    }
+
 // Tasteless as this may seem, making all members public allows member templates
 // to work in the absence of member template friends. (Matthew Langston)
 
@@ -165 +170 @@
 
 template<class T, class U> inline bool operator<(weak_ptr<T> const & a, weak_ptr<U> const & b)
 {
-    return a._internal_less(b);
+    return a.owner_before(b);
 }
 
 template<class T> void swap(weak_ptr<T> & a, weak_ptr<T> & b)

libs/smart_ptr/test/Jamfile.v2

@@ -50 +50 @@
           [ run wp_convertible_test.cpp ]
           [ run ip_convertible_test.cpp ]
           [ run allocate_shared_test.cpp ]
+          [ run owner_less_test.cpp ]
         ;
 }