forked from boostorg/smart_ptr
Check for BOOST_NO_CXX11_RVALUE_REFERENCES in addition to BOOST_NO_CXX11_SMART_PTR. Refs #8055.
[SVN r82927]
This commit is contained in:
@ -485,7 +485,7 @@ public:
|
|||||||
|
|
||||||
#endif // BOOST_NO_AUTO_PTR
|
#endif // BOOST_NO_AUTO_PTR
|
||||||
|
|
||||||
#if !defined( BOOST_NO_CXX11_SMART_PTR )
|
#if !defined( BOOST_NO_CXX11_SMART_PTR ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
|
||||||
|
|
||||||
template< class Y, class D >
|
template< class Y, class D >
|
||||||
shared_ptr( std::unique_ptr< Y, D > && r ): px( r.get() ), pn()
|
shared_ptr( std::unique_ptr< Y, D > && r ): px( r.get() ), pn()
|
||||||
@ -550,7 +550,7 @@ public:
|
|||||||
|
|
||||||
#endif // BOOST_NO_AUTO_PTR
|
#endif // BOOST_NO_AUTO_PTR
|
||||||
|
|
||||||
#if !defined( BOOST_NO_CXX11_SMART_PTR )
|
#if !defined( BOOST_NO_CXX11_SMART_PTR ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
|
||||||
|
|
||||||
template<class Y, class D>
|
template<class Y, class D>
|
||||||
shared_ptr & operator=( std::unique_ptr<Y, D> && r )
|
shared_ptr & operator=( std::unique_ptr<Y, D> && r )
|
||||||
|
Reference in New Issue
Block a user