Merge [58275], [58306] to release.

[SVN r58380]
This commit is contained in:
Peter Dimov
2009-12-14 17:44:19 +00:00
parent ba349679f3
commit f4386409d9
5 changed files with 12 additions and 11 deletions

View File

@@ -77,7 +77,7 @@ public:
template<class U>
#if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
intrusive_ptr( intrusive_ptr<U> const & rhs, typename detail::sp_enable_if_convertible<U,T>::type = detail::sp_empty() )
intrusive_ptr( intrusive_ptr<U> const & rhs, typename boost::detail::sp_enable_if_convertible<U,T>::type = boost::detail::sp_empty() )
#else