Subject: [Boost-commit] svn:boost r52454 - in trunk: boost/smart_ptr libs/smart_ptr/test
From: pdimov_at_[hidden]
Date: 2009-04-17 15:51:19
Author: pdimov
Date: 2009-04-17 15:51:18 EDT (Fri, 17 Apr 2009)
New Revision: 52454
URL: http://svn.boost.org/trac/boost/changeset/52454
Log:
Bring back "explicit" on the auto_ptr rvalue constructor. Refs #2951.
Added:
trunk/libs/smart_ptr/test/auto_ptr_lv_fail.cpp (contents, props changed)
Text files modified:
trunk/boost/smart_ptr/shared_ptr.hpp | 2 +-
trunk/libs/smart_ptr/test/Jamfile.v2 | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
Modified: trunk/boost/smart_ptr/shared_ptr.hpp
==============================================================================
--- trunk/boost/smart_ptr/shared_ptr.hpp (original)
+++ trunk/boost/smart_ptr/shared_ptr.hpp 2009-04-17 15:51:18 EDT (Fri, 17 Apr 2009)
@@ -286,7 +286,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: trunk/libs/smart_ptr/test/Jamfile.v2
==============================================================================
--- trunk/libs/smart_ptr/test/Jamfile.v2 (original)
+++ trunk/libs/smart_ptr/test/Jamfile.v2 2009-04-17 15:51:18 EDT (Fri, 17 Apr 2009)
@@ -57,5 +57,6 @@
[ run sp_recursive_assign_rv_test.cpp ]
[ run sp_recursive_assign2_rv_test.cpp ]
[ run esft_constructor_test.cpp ]
+ [ compile-fail auto_ptr_lv_fail.cpp ]
;
}
Added: trunk/libs/smart_ptr/test/auto_ptr_lv_fail.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/smart_ptr/test/auto_ptr_lv_fail.cpp 2009-04-17 15:51:18 EDT (Fri, 17 Apr 2009)
@@ -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;
+}