From a4293f9dfaf78dabe08c5c6554a299c110bda240 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Sat, 18 Apr 2009 21:32:43 +0000
Subject: [PATCH] Merge [52454] to release. Fixes #2951.

[SVN r52472]
---
 include/boost/smart_ptr/shared_ptr.hpp |  2 +-
 test/Jamfile.v2                        |  1 +
 test/auto_ptr_lv_fail.cpp              | 32 ++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 test/auto_ptr_lv_fail.cpp

diff --git a/include/boost/smart_ptr/shared_ptr.hpp b/include/boost/smart_ptr/shared_ptr.hpp
index 0ce3b97..7f46c35 100644
--- a/include/boost/smart_ptr/shared_ptr.hpp
+++ b/include/boost/smart_ptr/shared_ptr.hpp
@@ -277,7 +277,7 @@ public:
 #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 );
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index c862197..0c760b2 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -56,5 +56,6 @@ import testing ;
           [ 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 ]
         ;
 }
diff --git a/test/auto_ptr_lv_fail.cpp b/test/auto_ptr_lv_fail.cpp
new file mode 100644
index 0000000..b86832e
--- /dev/null
+++ b/test/auto_ptr_lv_fail.cpp
@@ -0,0 +1,32 @@
+#include <boost/config.hpp>
+
+#if defined(BOOST_MSVC)
+#pragma warning(disable: 4786)  // identifier truncated in debug info
+#pragma warning(disable: 4710)  // function not inlined
+#pragma warning(disable: 4711)  // function selected for automatic inline expansion
+#pragma warning(disable: 4514)  // unreferenced inline removed
+#endif
+
+//
+//  auto_ptr_lv_fail.cpp - a negative test for converting an auto_ptr to shared_ptr
+//
+//  Copyright 2009 Peter Dimov
+//
+//  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 <boost/shared_ptr.hpp>
+#include <memory>
+
+void f( boost::shared_ptr<int> )
+{
+}
+
+int main()
+{
+    std::auto_ptr<int> p;
+    f( p ); // must fail
+    return 0;
+}