mirror of
https://github.com/boostorg/smart_ptr.git
synced 2025-08-01 05:34:36 +02:00
Remove uses of BOOST_NO_MEMBER_TEMPLATES, BOOST_MSVC6_MEMBER_TEMPLATES
This commit is contained in:
@@ -60,8 +60,6 @@ public:
|
|||||||
if( px != 0 && add_ref ) intrusive_ptr_add_ref( px );
|
if( px != 0 && add_ref ) intrusive_ptr_add_ref( px );
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(BOOST_NO_MEMBER_TEMPLATES) || defined(BOOST_MSVC6_MEMBER_TEMPLATES)
|
|
||||||
|
|
||||||
template<class U>
|
template<class U>
|
||||||
#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
|
#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
|
||||||
|
|
||||||
@@ -77,8 +75,6 @@ public:
|
|||||||
if( px != 0 ) intrusive_ptr_add_ref( px );
|
if( px != 0 ) intrusive_ptr_add_ref( px );
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
intrusive_ptr(intrusive_ptr const & rhs): px( rhs.px )
|
intrusive_ptr(intrusive_ptr const & rhs): px( rhs.px )
|
||||||
{
|
{
|
||||||
if( px != 0 ) intrusive_ptr_add_ref( px );
|
if( px != 0 ) intrusive_ptr_add_ref( px );
|
||||||
@@ -89,16 +85,12 @@ public:
|
|||||||
if( px != 0 ) intrusive_ptr_release( px );
|
if( px != 0 ) intrusive_ptr_release( px );
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(BOOST_NO_MEMBER_TEMPLATES) || defined(BOOST_MSVC6_MEMBER_TEMPLATES)
|
|
||||||
|
|
||||||
template<class U> intrusive_ptr & operator=(intrusive_ptr<U> const & rhs)
|
template<class U> intrusive_ptr & operator=(intrusive_ptr<U> const & rhs)
|
||||||
{
|
{
|
||||||
this_type(rhs).swap(*this);
|
this_type(rhs).swap(*this);
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Move support
|
// Move support
|
||||||
|
|
||||||
#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
|
#if !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
|
||||||
|
Reference in New Issue
Block a user