diff --git a/include/boost/smart_ptr/detail/deprecated_macros.hpp b/include/boost/smart_ptr/detail/deprecated_macros.hpp index 4e4ba60..f39d2ac 100644 --- a/include/boost/smart_ptr/detail/deprecated_macros.hpp +++ b/include/boost/smart_ptr/detail/deprecated_macros.hpp @@ -15,7 +15,7 @@ BOOST_PRAGMA_MESSAGE("The macro BOOST_SP_ENABLE_DEBUG_HOOKS has been deprecated #if defined(BOOST_SP_USE_STD_ALLOCATOR) -BOOST_PRAGMA_MESSAGE("The macro BOOST_SP_USE_STD_ALLOCATOR has been deprecated in 1.87 and support for it will be removed.") +BOOST_PRAGMA_MESSAGE("The macro BOOST_SP_USE_STD_ALLOCATOR has been deprecated in 1.87 and support for it was removed in 1.90.") #endif diff --git a/include/boost/smart_ptr/detail/sp_counted_impl.hpp b/include/boost/smart_ptr/detail/sp_counted_impl.hpp index a3f83c7..6fdf9c3 100644 --- a/include/boost/smart_ptr/detail/sp_counted_impl.hpp +++ b/include/boost/smart_ptr/detail/sp_counted_impl.hpp @@ -18,10 +18,6 @@ // http://www.boost.org/LICENSE_1_0.txt) // -#if defined(BOOST_SP_USE_STD_ALLOCATOR) && defined(BOOST_SP_USE_QUICK_ALLOCATOR) -# error BOOST_SP_USE_STD_ALLOCATOR and BOOST_SP_USE_QUICK_ALLOCATOR are incompatible. -#endif - #include #include #include @@ -91,20 +87,6 @@ public: return 0; } -#if defined(BOOST_SP_USE_STD_ALLOCATOR) - - void * operator new( std::size_t ) - { - return std::allocator().allocate( 1, static_cast(0) ); - } - - void operator delete( void * p ) - { - std::allocator().deallocate( static_cast(p), 1 ); - } - -#endif - #if defined(BOOST_SP_USE_QUICK_ALLOCATOR) void * operator new( std::size_t ) @@ -164,20 +146,6 @@ public: return &reinterpret_cast( del ); } -#if defined(BOOST_SP_USE_STD_ALLOCATOR) - - void * operator new( std::size_t ) - { - return std::allocator().allocate( 1, static_cast(0) ); - } - - void operator delete( void * p ) - { - std::allocator().deallocate( static_cast(p), 1 ); - } - -#endif - #if defined(BOOST_SP_USE_QUICK_ALLOCATOR) void * operator new( std::size_t ) diff --git a/test/shared_ptr_alloc_test.cpp b/test/shared_ptr_alloc_test.cpp index 9b1ebde..a0ec41e 100644 --- a/test/shared_ptr_alloc_test.cpp +++ b/test/shared_ptr_alloc_test.cpp @@ -122,12 +122,6 @@ int main() std::cout << "BOOST_HAS_THREADS: (not defined)\n"; #endif -#if defined(BOOST_SP_USE_STD_ALLOCATOR) - std::cout << "BOOST_SP_USE_STD_ALLOCATOR: (defined)\n"; -#else - std::cout << "BOOST_SP_USE_STD_ALLOCATOR: (not defined)\n"; -#endif - #if defined(BOOST_SP_USE_QUICK_ALLOCATOR) std::cout << "BOOST_SP_USE_QUICK_ALLOCATOR: (defined)\n"; #else