mirror of
https://github.com/boostorg/smart_ptr.git
synced 2026-05-03 19:40:48 +02:00
Fix sp_convertible_test.cpp failure in C++0x mode.
[SVN r45194]
This commit is contained in:
@@ -349,7 +349,16 @@ public:
|
||||
}
|
||||
|
||||
template<class Y>
|
||||
shared_ptr( shared_ptr<Y> && r ): px( r.px ), pn() // never throws
|
||||
#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
|
||||
|
||||
shared_ptr( shared_ptr<Y> && r, typename detail::sp_enable_if_convertible<Y,T>::type = detail::sp_empty() )
|
||||
|
||||
#else
|
||||
|
||||
shared_ptr( shared_ptr<Y> && r )
|
||||
|
||||
#endif
|
||||
: px( r.px ), pn() // never throws
|
||||
{
|
||||
pn.swap( r.pn );
|
||||
r.px = 0;
|
||||
@@ -772,7 +781,6 @@ template<class D, class T> D * get_deleter( shared_ptr<T> const & p )
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
return del;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user