*** shared_count.hpp.orig	Thu Mar 17 01:30:54 2005
--- shared_count.hpp	Thu Mar 17 01:21:09 2005
***************
*** 19,26 ****
  
  #include <boost/config.hpp>
  
! #if defined(BOOST_SP_USE_STD_ALLOCATOR) && defined(BOOST_SP_USE_QUICK_ALLOCATOR) && defined(BOOST_SP_USE_MALLOC_ALLOCATOR)
! # error BOOST_SP_USE_STD_ALLOCATOR and BOOST_SP_USE_QUICK_ALLOCATOR and BOOST_SP_USE_MALLOC_ALLOCATOR are incompatible.
  #endif
  
  #include <boost/checked_delete.hpp>
--- 19,26 ----
  
  #include <boost/config.hpp>
  
! #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 <boost/checked_delete.hpp>
***************
*** 38,47 ****
  #include <typeinfo>         // std::type_info in get_deleter
  #include <cstddef>          // std::size_t
  
- #if defined(BOOST_SP_USE_MALLOC_ALLOCATOR)
- #include <cstdlib>			// std::malloc, std::free
- #endif
- 
  #ifdef __BORLANDC__
  # pragma warn -8026     // Functions with excep. spec. are not expanded inline
  # pragma warn -8027     // Functions containing try are not expanded inline
--- 38,43 ----
***************
*** 299,318 ****
      }
  
  #endif
- 
- #if defined(BOOST_SP_USE_MALLOC_ALLOCATOR)
- 
- 	void* operator new(std::size_t n)
-     {
-         return std::malloc(n);
-     }
- 
-     void operator delete(void * p)
-     {
-         std::free(p);
-     }
- #endif
- 
  };
  
  #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
--- 295,300 ----