Index: boost/enable_shared_from_this.hpp
===================================================================
--- boost/enable_shared_from_this.hpp	(revision 44358)
+++ boost/enable_shared_from_this.hpp	(working copy)
@@ -30,7 +30,8 @@
         if( !owned() && _internal_shared_this.get() == 0 )
         {
             T * p = dynamic_cast<T *>(const_cast<enable_shared_from_this*>(this));
-            _internal_shared_this = shared_ptr<T>( p, detail::sp_deleter_wrapper() );
+            detail::shared_count c(p, detail::sp_deleter_wrapper());
+            _internal_shared_this = shared_ptr<T>(c, p);
             BOOST_ASSERT(_internal_shared_this.get() == this);
             _internal_weak_this = _internal_shared_this;
         }
@@ -117,18 +118,6 @@
     }
 }
 
-template< class T, class Y > inline void sp_accept_owner( boost::shared_ptr<Y> * ptr, boost::enable_shared_from_this<T> const * pe, void * /*pd*/ )
-{
-    if( pe != 0 )
-    {
-        pe->_internal_accept_owner( *ptr );
-    }
-}
-
-template< class T, class Y > inline void sp_accept_owner( boost::shared_ptr<Y> * /*ptr*/, boost::enable_shared_from_this<T> const * /*pe*/, boost::detail::sp_deleter_wrapper * /*pd*/ )
-{
-}
-
 } // namespace boost
 
 #endif  // #ifndef BOOST_ENABLE_SHARED_FROM_THIS_HPP_INCLUDED
Index: boost/detail/bad_shared_from_this.hpp
===================================================================
--- boost/detail/bad_shared_from_this.hpp	(revision 0)
+++ boost/detail/bad_shared_from_this.hpp	(revision 0)
@@ -0,0 +1,59 @@
+#ifndef BOOST_BAD_SHARED_FROM_THIS_HPP_INCLUDED
+#define BOOST_BAD_SHARED_FROM_THIS_HPP_INCLUDED
+
+// MS compatible compilers support #pragma once
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+//
+//  detail/bad_shared_from_this.hpp
+//
+//  Copyright (c) 2008 Daniel Frey
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <exception>
+
+#ifdef __BORLANDC__
+# pragma warn -8026     // Functions with excep. spec. are not expanded inline
+#endif
+
+namespace boost
+{
+
+// The standard library that comes with Borland C++ 5.5.1, 5.6.4
+// defines std::exception and its members as having C calling
+// convention (-pc). When the definition of bad_shared_from_this
+// is compiled with -ps, the compiler issues an error.
+// Hence, the temporary #pragma option -pc below.
+
+#if defined(__BORLANDC__) && __BORLANDC__ <= 0x564
+# pragma option push -pc
+#endif
+
+class bad_shared_from_this: public std::exception
+{
+public:
+
+    virtual char const * what() const throw()
+    {
+        return "boost::bad_shared_from_this";
+    }
+};
+
+#if defined(__BORLANDC__) && __BORLANDC__ <= 0x564
+# pragma option pop
+#endif
+
+} // namespace boost
+
+#ifdef __BORLANDC__
+# pragma warn .8026     // Functions with excep. spec. are not expanded inline
+#endif
+
+#endif  // #ifndef BOOST_BAD_SHARED_FROM_THIS_HPP_INCLUDED
Index: boost/detail/shared_count.hpp
===================================================================
--- boost/detail/shared_count.hpp	(revision 44358)
+++ boost/detail/shared_count.hpp	(working copy)
@@ -25,7 +25,6 @@
 #include <boost/config.hpp>
 #include <boost/checked_delete.hpp>
 #include <boost/throw_exception.hpp>
-#include <boost/detail/bad_weak_ptr.hpp>
 #include <boost/detail/sp_counted_base.hpp>
 #include <boost/detail/sp_counted_impl.hpp>
 
@@ -46,8 +45,6 @@
 
 #endif
 
-struct sp_nothrow_tag {};
-
 class weak_count;
 
 class shared_count
@@ -217,8 +214,7 @@
         if( pi_ != 0 ) pi_->add_ref_copy();
     }
 
-    explicit shared_count(weak_count const & r); // throws bad_weak_ptr when r.use_count() == 0
-    shared_count( weak_count const & r, sp_nothrow_tag ); // constructs an empty *this when r.use_count() == 0
+    explicit shared_count(weak_count const & r); // nothrow
 
     shared_count & operator= (shared_count const & r) // nothrow
     {
@@ -321,20 +317,28 @@
     weak_count & operator= (shared_count const & r) // nothrow
     {
         sp_counted_base * tmp = r.pi_;
-        if(tmp != 0) tmp->weak_add_ref();
-        if(pi_ != 0) pi_->weak_release();
-        pi_ = tmp;
 
+        if( tmp != pi_ )
+        {
+            if(tmp != 0) tmp->weak_add_ref();
+            if(pi_ != 0) pi_->weak_release();
+            pi_ = tmp;
+        }
+
         return *this;
     }
 
     weak_count & operator= (weak_count const & r) // nothrow
     {
         sp_counted_base * tmp = r.pi_;
-        if(tmp != 0) tmp->weak_add_ref();
-        if(pi_ != 0) pi_->weak_release();
-        pi_ = tmp;
 
+        if( tmp != pi_ )
+        {
+            if(tmp != 0) tmp->weak_add_ref();
+            if(pi_ != 0) pi_->weak_release();
+            pi_ = tmp;
+        }
+
         return *this;
     }
 
@@ -366,17 +370,6 @@
         , id_(shared_count_id)
 #endif
 {
-    if( pi_ == 0 || !pi_->add_ref_lock() )
-    {
-        boost::throw_exception( boost::bad_weak_ptr() );
-    }
-}
-
-inline shared_count::shared_count( weak_count const & r, sp_nothrow_tag ): pi_( r.pi_ )
-#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
-        , id_(shared_count_id)
-#endif
-{
     if( pi_ != 0 && !pi_->add_ref_lock() )
     {
         pi_ = 0;
Index: boost/weak_ptr.hpp
===================================================================
--- boost/weak_ptr.hpp	(revision 44358)
+++ boost/weak_ptr.hpp	(working copy)
@@ -93,7 +93,8 @@
 
     shared_ptr<T> lock() const // never throws
     {
-        return shared_ptr<element_type>( *this, boost::detail::sp_nothrow_tag() );
+        detail::shared_count c(pn);
+        return shared_ptr<T>(c, !c.empty() ? px : 0);
     }
 
     long use_count() const // never throws
Index: boost/shared_ptr.hpp
===================================================================
--- boost/shared_ptr.hpp	(revision 44358)
+++ boost/shared_ptr.hpp	(working copy)
@@ -25,6 +25,7 @@
 #include <boost/assert.hpp>
 #include <boost/checked_delete.hpp>
 #include <boost/throw_exception.hpp>
+#include <boost/detail/bad_weak_ptr.hpp>
 #include <boost/detail/shared_count.hpp>
 #include <boost/detail/workaround.hpp>
 
@@ -120,10 +121,6 @@
 {
 }
 
-inline void sp_accept_owner( sp_any_pointer, sp_any_pointer, sp_any_pointer )
-{
-}
-
 #else // _MANAGED
 
 inline void sp_accept_owner( ... )
@@ -172,16 +169,14 @@
 
     template<class Y, class D> shared_ptr( Y * p, D d ): px( p ), pn( p, d )
     {
-        D * pd = static_cast<D *>( pn.get_deleter( BOOST_SP_TYPEID(D) ) );
-        sp_accept_owner( this, p, pd );
+        sp_accept_owner( this, p );
     }
 
     // As above, but with allocator. A's copy constructor shall not throw.
 
     template<class Y, class D, class A> shared_ptr( Y * p, D d, A a ): px( p ), pn( p, d, a )
     {
-        D * pd = static_cast<D *>( pn.get_deleter( BOOST_SP_TYPEID(D) ) );
-        sp_accept_owner( this, p, pd );
+        sp_accept_owner( this, p );
     }
 
 //  generated copy constructor, assignment, destructor are fine...
@@ -199,19 +194,19 @@
 #endif
 
     template<class Y>
-    explicit shared_ptr(weak_ptr<Y> const & r): pn(r.pn) // may throw
+    explicit shared_ptr(weak_ptr<Y> const & r): pn(r.pn)
     {
-        // it is now safe to copy r.px, as pn(r.pn) did not throw
+        if( pn.empty() )
+            boost::throw_exception( boost::bad_weak_ptr() );
+
+        // it is now safe to copy r.px, as pn is not empty
         px = r.px;
     }
 
     template<class Y>
-    shared_ptr( weak_ptr<Y> const & r, boost::detail::sp_nothrow_tag ): px( 0 ), pn( r.pn, boost::detail::sp_nothrow_tag() ) // never throws
+    shared_ptr(detail::shared_count & c, Y * p): px(p) // never throws
     {
-        if( !pn.empty() )
-        {
-            px = r.px;
-        }
+        pn.swap(c);
     }
 
     template<class Y>
@@ -468,6 +463,11 @@
         return pn.get_deleter( ti );
     }
 
+    detail::shared_count const & _internal_shared_count() const // never throws
+    {
+        return pn;
+    }
+
 // Tasteless as this may seem, making all members public allows member templates
 // to work in the absence of member template friends. (Matthew Langston)
 
Index: boost/enable_shared_from_this_light.hpp
===================================================================
--- boost/enable_shared_from_this_light.hpp	(revision 0)
+++ boost/enable_shared_from_this_light.hpp	(revision 0)
@@ -0,0 +1,77 @@
+#ifndef BOOST_ENABLE_SHARED_FROM_THIS_LIGHT_HPP_INCLUDED
+#define BOOST_ENABLE_SHARED_FROM_THIS_LIGHT_HPP_INCLUDED
+
+//
+//  enable_shared_from_this_light.hpp
+//
+//  Copyright (c) 2002 Peter Dimov
+//  Copyright (c) 2008 Daniel Frey
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+//  http://www.boost.org/libs/smart_ptr/enable_shared_from_this_light.html
+//
+
+#include <boost/detail/shared_count.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/throw_exception.hpp>
+#include <boost/detail/bad_shared_from_this.hpp>
+
+namespace boost
+{
+
+template<class T> class enable_shared_from_this_light
+{
+protected:
+
+    enable_shared_from_this_light()
+    {
+    }
+
+    enable_shared_from_this_light(enable_shared_from_this_light const &)
+    {
+    }
+
+    enable_shared_from_this_light & operator=(enable_shared_from_this_light const &)
+    {
+        return *this;
+    }
+
+    ~enable_shared_from_this_light()
+    {
+    }
+
+public:
+
+    shared_ptr<T> shared_from_this() // never throws
+    {
+        detail::shared_count c(_internal_weak_count);
+        if( c.empty() )
+            boost::throw_exception( boost::bad_shared_from_this() );
+        return shared_ptr<T>(c, static_cast<T *>(this));
+    }
+
+    shared_ptr<T const> shared_from_this() const // never throws
+    {
+        detail::shared_count c(_internal_weak_count);
+        if( c.empty() )
+            boost::throw_exception( boost::bad_shared_from_this() );
+        return shared_ptr<T const>(c, static_cast<T const *>(this));
+    }
+
+    mutable detail::weak_count _internal_weak_count;
+};
+
+template<class T, class Y> void sp_accept_owner( shared_ptr<Y> * ptr, enable_shared_from_this_light<T> const * pe )
+{
+    if(pe != 0)
+    {
+        pe->_internal_weak_count = ptr->_internal_shared_count();
+    }
+}
+
+} // namespace boost
+
+#endif  // #ifndef BOOST_ENABLE_SHARED_FROM_THIS_LIGHT_HPP_INCLUDED