Remove uses of BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS

boostorg · Sep 25, 2024 · 5d8304d · 5d8304d
1 parent 044d1f2
commit 5d8304d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/include/boost/smart_ptr/local_shared_ptr.hpp b/include/boost/smart_ptr/local_shared_ptr.hpp
@@ -396,11 +396,7 @@ template<class T> class local_shared_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
-#else
-    template<class Y> operator shared_ptr<Y>() const BOOST_SP_NOEXCEPT
-#endif
     {
         boost::detail::sp_assert_convertible<T, Y>();
 
@@ -414,11 +410,7 @@ template<class T> class local_shared_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 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>();
 

diff --git 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();
 }