boostorg/smart_ptr
1
0
Fork 1
mirror of https://github.com/boostorg/smart_ptr.git synced 2026-04-29 02:24:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1106.

Browse Source 
[SVN r45068]
This commit is contained in:
Peter Dimov
2008-05-03 15:07:58 +00:00
parent 440fcb7ba0
commit 0c4aaef77c
8 changed files with 314 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/shared_ptr.hpp
+15 -2
View File
@@ -32,6 +32,10 @@
#include <boost/detail/shared_count.hpp>
#include <boost/detail/workaround.hpp>
#if !defined( BOOST_NO_SFINAE )
#include <boost/detail/sp_convertible.hpp>
#endif
#if !defined(BOOST_SP_NO_ATOMIC_ACCESS)
#include <boost/detail/spinlock_pool.hpp>
#include <boost/memory_order.hpp>
@@ -224,11 +228,20 @@ public:
}
template<class Y>
shared_ptr(shared_ptr<Y> const & r): px(r.px), pn(r.pn) // never throws
#if !defined( BOOST_NO_SFINAE )
shared_ptr( shared_ptr<Y> const & r, typename detail::sp_enable_if_convertible<Y,T>::type = detail::sp_empty() )
#else
shared_ptr( shared_ptr<Y> const & r )
#endif
: px( r.px ), pn( r.pn ) // never throws
{
}
shared_ptr(detail::shared_count const & c, T * p): px(p), pn(c) // never throws
shared_ptr( detail::shared_count const & c, T * p ): px( p ), pn( c ) // never throws
{
}