diff --git a/include/boost/smart_ptr/local_shared_ptr.hpp b/include/boost/smart_ptr/local_shared_ptr.hpp index 4a02b7a..bf011ef 100644 --- a/include/boost/smart_ptr/local_shared_ptr.hpp +++ b/include/boost/smart_ptr/local_shared_ptr.hpp @@ -396,11 +396,7 @@ public: // conversions to shared_ptr, weak_ptr -#if !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS) template::type> operator shared_ptr() const BOOST_SP_NOEXCEPT -#else - template operator shared_ptr() const BOOST_SP_NOEXCEPT -#endif { boost::detail::sp_assert_convertible(); @@ -414,11 +410,7 @@ public: } } -#if !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS) template::type> operator weak_ptr() const BOOST_SP_NOEXCEPT -#else - template operator weak_ptr() const BOOST_SP_NOEXCEPT -#endif { boost::detail::sp_assert_convertible(); diff --git a/test/lsp_convertible_test2.cpp b/test/lsp_convertible_test2.cpp index a946e53..acafda4 100644 --- a/test/lsp_convertible_test2.cpp +++ b/test/lsp_convertible_test2.cpp @@ -78,8 +78,6 @@ using boost::weak_ptr; int main() { -#if !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS) - TEST_CV_TRUE( X, X ) TEST_CV_TRUE( X, void ) TEST_CV_FALSE( void, X ) @@ -102,7 +100,5 @@ int main() TEST_CV_TRUE( X[3], void ) TEST_CV_FALSE( void, X[3] ) -#endif - return boost::report_errors(); }