feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Merge branch 'intrusive_ptr_move' of https://github.com/jtwang83/smart_ptr into develop

Browse Source
This commit is contained in:
Peter Dimov
2016-05-17 18:29:29 +03:00
parent 582eb63cb3 334654de06
commit 097d2e9bf9
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/smart_ptr/intrusive_ptr.hpp
View File

@ -122,6 +122,20 @@ public:
return *this; return *this;
} }
#if !defined(BOOST_NO_MEMBER_TEMPLATES) || defined(BOOST_MSVC6_MEMBER_TEMPLATES)
template<class U> friend class intrusive_ptr;
template<class U>
#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
intrusive_ptr(intrusive_ptr<U> && rhs, typename boost::detail::sp_enable_if_convertible<U,T>::type = boost::detail::sp_empty())
#else
intrusive_ptr(intrusive_ptr<U> && rhs)
#endif
: px( rhs.px )
{
rhs.px = 0;
}
#endif
#endif #endif
intrusive_ptr & operator=(intrusive_ptr const & rhs) intrusive_ptr & operator=(intrusive_ptr const & rhs)