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

Merged revision(s) 82927 from trunk: Check for BOOST_NO_CXX11_RVALUE_REFERENCES in addition to BOOST_NO_CXX11_SMART_PTR. Fixes #8055.

Browse Source 
[SVN r82928]
This commit is contained in:
Peter Dimov
2013-02-16 17:21:23 +00:00
parent de6dc3a26e
commit e39fcad839
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/smart_ptr/shared_ptr.hpp
View File

@ -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 )