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

Remove unnecessary #ifdef

Browse Source
This commit is contained in:
Peter Dimov
2016-05-17 18:34:18 +03:00
parent 097d2e9bf9
commit a7ade6f062
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,19 +122,22 @@ 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> friend class intrusive_ptr;
template<class U> template<class U>
#if !defined( BOOST_SP_NO_SP_CONVERTIBLE ) #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()) intrusive_ptr(intrusive_ptr<U> && rhs, typename boost::detail::sp_enable_if_convertible<U,T>::type = boost::detail::sp_empty())
#else #else
intrusive_ptr(intrusive_ptr<U> && rhs) intrusive_ptr(intrusive_ptr<U> && rhs)
#endif #endif
: px( rhs.px ) : px( rhs.px )
{ {
rhs.px = 0; rhs.px = 0;
} }
#endif
#endif #endif