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

Subject: [Boost-commit] svn:boost r52472 - in branches/release: boost/smart_ptr libs/smart_ptr/test
From: pdimov_at_[hidden]
Date: 2009-04-18 17:32:44

Author: pdimov
Date: 2009-04-18 17:32:43 EDT (Sat, 18 Apr 2009)
New Revision: 52472
URL: http://svn.boost.org/trac/boost/changeset/52472

Log:
Merge [52454] to release. Fixes #2951.
Added:
   branches/release/libs/smart_ptr/test/auto_ptr_lv_fail.cpp
      - copied unchanged from r52454, /trunk/libs/smart_ptr/test/auto_ptr_lv_fail.cpp
Text files modified: 
   branches/release/boost/smart_ptr/shared_ptr.hpp |     2 +-                                      
   branches/release/libs/smart_ptr/test/Jamfile.v2 |     1 +                                       
   2 files changed, 2 insertions(+), 1 deletions(-)

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	2009-04-18 17:32:43 EDT (Sat, 18 Apr 2009)
@@ -277,7 +277,7 @@
 #if !defined( BOOST_NO_SFINAE ) && !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
 
     template<class Ap>
-    shared_ptr( Ap r, typename boost::detail::sp_enable_if_auto_ptr<Ap, int>::type = 0 ): px( r.get() ), pn()
+    explicit shared_ptr( Ap r, typename boost::detail::sp_enable_if_auto_ptr<Ap, int>::type = 0 ): px( r.get() ), pn()
     {
         typename Ap::element_type * tmp = r.get();
         pn = boost::detail::shared_count( r );

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	2009-04-18 17:32:43 EDT (Sat, 18 Apr 2009)
@@ -56,5 +56,6 @@
           [ run sp_recursive_assign2_test.cpp ]
           [ run sp_recursive_assign_rv_test.cpp ]
           [ run sp_recursive_assign2_rv_test.cpp ]
+          [ compile-fail auto_ptr_lv_fail.cpp ]
         ;
 }