mirror of
https://github.com/boostorg/smart_ptr.git
synced 2025-07-31 21:24:40 +02:00
Remove uses of BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
This commit is contained in:
@@ -396,11 +396,7 @@ public:
|
|||||||
|
|
||||||
// conversions to shared_ptr, weak_ptr
|
// conversions to shared_ptr, weak_ptr
|
||||||
|
|
||||||
#if !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
|
|
||||||
template<class Y, class E = typename boost::detail::sp_enable_if_convertible<T,Y>::type> operator shared_ptr<Y>() const BOOST_SP_NOEXCEPT
|
template<class Y, class E = typename boost::detail::sp_enable_if_convertible<T,Y>::type> operator shared_ptr<Y>() const BOOST_SP_NOEXCEPT
|
||||||
#else
|
|
||||||
template<class Y> operator shared_ptr<Y>() const BOOST_SP_NOEXCEPT
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
boost::detail::sp_assert_convertible<T, Y>();
|
boost::detail::sp_assert_convertible<T, Y>();
|
||||||
|
|
||||||
@@ -414,11 +410,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
|
|
||||||
template<class Y, class E = typename boost::detail::sp_enable_if_convertible<T,Y>::type> operator weak_ptr<Y>() const BOOST_SP_NOEXCEPT
|
template<class Y, class E = typename boost::detail::sp_enable_if_convertible<T,Y>::type> operator weak_ptr<Y>() const BOOST_SP_NOEXCEPT
|
||||||
#else
|
|
||||||
template<class Y> operator weak_ptr<Y>() const BOOST_SP_NOEXCEPT
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
boost::detail::sp_assert_convertible<T, Y>();
|
boost::detail::sp_assert_convertible<T, Y>();
|
||||||
|
|
||||||
|
@@ -78,8 +78,6 @@ using boost::weak_ptr;
|
|||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
#if !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
|
|
||||||
|
|
||||||
TEST_CV_TRUE( X, X )
|
TEST_CV_TRUE( X, X )
|
||||||
TEST_CV_TRUE( X, void )
|
TEST_CV_TRUE( X, void )
|
||||||
TEST_CV_FALSE( void, X )
|
TEST_CV_FALSE( void, X )
|
||||||
@@ -102,7 +100,5 @@ int main()
|
|||||||
TEST_CV_TRUE( X[3], void )
|
TEST_CV_TRUE( X[3], void )
|
||||||
TEST_CV_FALSE( void, X[3] )
|
TEST_CV_FALSE( void, X[3] )
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return boost::report_errors();
|
return boost::report_errors();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user