[Boost-commit] svn:boost r81335 - in branches/release: . boost boost/smart_ptr boost/smart_ptr/detail libs libs/smart_ptr/test

Subject: [Boost-commit] svn:boost r81335 - in branches/release: . boost boost/smart_ptr boost/smart_ptr/detail libs libs/smart_ptr/test
From: pdimov_at_[hidden]
Date: 2012-11-14 07:04:49

Author: pdimov
Date: 2012-11-14 07:04:48 EST (Wed, 14 Nov 2012)
New Revision: 81335
URL: http://svn.boost.org/trac/boost/changeset/81335

Log:
Merged [81131] from trunk. Fixes #6625.
Added:
   branches/release/libs/smart_ptr/test/sp_unique_ptr_test.cpp
      - copied unchanged from r81131, /trunk/libs/smart_ptr/test/sp_unique_ptr_test.cpp
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/libs/   (props changed)
Text files modified: 
   branches/release/boost/smart_ptr/detail/shared_count.hpp |    63 ++++++++++++++++++++++++++++++++++++++++
   branches/release/boost/smart_ptr/shared_ptr.hpp          |    12 +++++++                                 
   branches/release/libs/smart_ptr/test/Jamfile.v2          |     1                                         
   3 files changed, 76 insertions(+), 0 deletions(-)

Modified: branches/release/boost/smart_ptr/detail/shared_count.hpp
==============================================================================
--- branches/release/boost/smart_ptr/detail/shared_count.hpp	(original)
+++ branches/release/boost/smart_ptr/detail/shared_count.hpp	2012-11-14 07:04:48 EST (Wed, 14 Nov 2012)
@@ -37,6 +37,10 @@
 #include <functional>       // std::less
 #include <new>              // std::bad_alloc
 
+#if !defined( BOOST_NO_CXX11_SMART_PTR )
+# include <boost/utility/addressof.hpp>
+#endif
+
 namespace boost
 {
 
@@ -56,6 +60,38 @@
 {
 };
 
+#if !defined( BOOST_NO_CXX11_SMART_PTR )
+
+template< class T > class sp_reference_wrapper
+{ 
+public:
+
+    explicit sp_reference_wrapper( T & t): t_( boost::addressof( t ) )
+    {
+    }
+
+    template< class Y > void operator()( Y * p ) const
+    {
+        (*t_)( p );
+    }
+
+private:
+
+    T * t_;
+};
+
+template< class D > struct sp_convert_reference
+{
+    typedef D type;
+};
+
+template< class D > struct sp_convert_reference< D& >
+{
+    typedef sp_reference_wrapper< D > type;
+};
+
+#endif
+
 class weak_count;
 
 class shared_count
@@ -300,6 +336,33 @@
 
 #endif 
 
+#if !defined( BOOST_NO_CXX11_SMART_PTR )
+
+    template<class Y, class D>
+    explicit shared_count( std::unique_ptr<Y, D> & r ): pi_( 0 )
+#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
+        , id_(shared_count_id)
+#endif
+    {
+        typedef typename sp_convert_reference<D>::type D2;
+
+        D2 d2( r.get_deleter() );
+        pi_ = new sp_counted_impl_pd< Y*, D2 >( r.get(), d2 );
+
+#ifdef BOOST_NO_EXCEPTIONS
+
+        if( pi_ == 0 )
+        {
+            boost::throw_exception( std::bad_alloc() );
+        }
+
+#endif
+
+        r.release();
+    }
+
+#endif
+
     ~shared_count() // nothrow
     {
         if( pi_ != 0 ) pi_->release();

Modified: branches/release/boost/smart_ptr/shared_ptr.hpp
==============================================================================
--- branches/release/boost/smart_ptr/shared_ptr.hpp	(original)
+++ branches/release/boost/smart_ptr/shared_ptr.hpp	2012-11-14 07:04:48 EST (Wed, 14 Nov 2012)
@@ -304,6 +304,18 @@
 
 #endif // BOOST_NO_AUTO_PTR
 
+#if !defined( BOOST_NO_CXX11_SMART_PTR )
+
+    template< class Y, class D >
+    shared_ptr( std::unique_ptr< Y, D > && r): px( r.get() ), pn()
+    {
+        Y * tmp = r.get();
+        pn = boost::detail::shared_count( r );
+        boost::detail::sp_enable_shared_from_this( this, tmp, tmp );
+    }
+
+#endif
+
     // assignment
 
     shared_ptr & operator=( shared_ptr const & r ) // never throws

Modified: branches/release/libs/smart_ptr/test/Jamfile.v2
==============================================================================
--- branches/release/libs/smart_ptr/test/Jamfile.v2	(original)
+++ branches/release/libs/smart_ptr/test/Jamfile.v2	2012-11-14 07:04:48 EST (Wed, 14 Nov 2012)
@@ -68,5 +68,6 @@
           [ run get_deleter_array_test.cpp ]
           [ run ip_hash_test.cpp ]
           [ run owner_less_test.cpp ]
+          [ run sp_unique_ptr_test.cpp ]
         ;
 }