Index: boost/shared_ptr.hpp
===================================================================
--- boost/shared_ptr.hpp	(revision 50320)
+++ boost/shared_ptr.hpp	(working copy)
@@ -511,11 +511,16 @@
         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,7 +567,7 @@
 
 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)
Index: boost/weak_ptr.hpp
===================================================================
--- boost/weak_ptr.hpp	(revision 50320)
+++ boost/weak_ptr.hpp	(working copy)
@@ -141,11 +141,16 @@
         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,7 +170,7 @@
 
 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)
Index: libs/smart_ptr/test/Jamfile.v2
===================================================================
--- libs/smart_ptr/test/Jamfile.v2	(revision 50320)
+++ libs/smart_ptr/test/Jamfile.v2	(working copy)
@@ -50,5 +50,6 @@
           [ run wp_convertible_test.cpp ]
           [ run ip_convertible_test.cpp ]
           [ run allocate_shared_test.cpp ]
+          [ run owner_less_test.cpp ]
         ;
 }