From 5d8304d2cc0f613571bd74cf27eb1f42c236f8d7 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 25 Sep 2024 12:42:20 +0300 Subject: [PATCH] Remove uses of BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS --- include/boost/smart_ptr/local_shared_ptr.hpp | 8 -------- test/lsp_convertible_test2.cpp | 4 ---- 2 files changed, 12 deletions(-) diff --git a/include/boost/smart_ptr/local_shared_ptr.hpp b/include/boost/smart_ptr/local_shared_ptr.hpp index 4a02b7a980..bf011ef674 100644 --- a/include/boost/smart_ptr/local_shared_ptr.hpp +++ b/include/boost/smart_ptr/local_shared_ptr.hpp @@ -396,11 +396,7 @@ template class local_shared_ptr // 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 @@ template class local_shared_ptr } } -#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 a946e533f2..acafda4bdf 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(); }