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

Subject: [Boost-commit] svn:boost r75754 - in branches/release: . boost boost/smart_ptr libs libs/smart_ptr/test
From: pdimov_at_[hidden]
Date: 2011-11-30 12:51:44

Author: pdimov
Date: 2011-11-30 12:51:43 EST (Wed, 30 Nov 2011)
New Revision: 75754
URL: http://svn.boost.org/trac/boost/changeset/75754

Log:
Merge [75390] to release. Fixes #4493.
Added:
   branches/release/libs/smart_ptr/test/get_deleter_array_test.cpp
      - copied unchanged from r75390, /trunk/libs/smart_ptr/test/get_deleter_array_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/shared_array.hpp |    10 ++++++++++                              
   branches/release/libs/smart_ptr/test/Jamfile.v2   |     1 +                                       
   2 files changed, 11 insertions(+), 0 deletions(-)

Modified: branches/release/boost/smart_ptr/shared_array.hpp
==============================================================================
--- branches/release/boost/smart_ptr/shared_array.hpp	(original)
+++ branches/release/boost/smart_ptr/shared_array.hpp	2011-11-30 12:51:43 EST (Wed, 30 Nov 2011)
@@ -131,6 +131,11 @@
         pn.swap(other.pn);
     }
 
+    void * _internal_get_deleter( boost::detail::sp_typeinfo const & ti ) const
+    {
+        return pn.get_deleter( ti );
+    }
+
 private:
 
     T * px;                     // contained pointer
@@ -158,6 +163,11 @@
     a.swap(b);
 }
 
+template< class D, class T > D * get_deleter( shared_array<T> const & p )
+{
+    return static_cast< D * >( p._internal_get_deleter( BOOST_SP_TYPEID(D) ) );
+}
+
 } // namespace boost
 
 #endif  // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)

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	2011-11-30 12:51:43 EST (Wed, 30 Nov 2011)
@@ -65,5 +65,6 @@
           [ run sp_typeinfo_test.cpp ]
           [ compile make_shared_fp_test.cpp ]
           [ run sp_hash_test.cpp ]
+          [ run get_deleter_array_test.cpp ]
         ;
 }