diff options
Diffstat (limited to 'boost/container/node_allocator.hpp')
| -rw-r--r-- | boost/container/node_allocator.hpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/boost/container/node_allocator.hpp b/boost/container/node_allocator.hpp index 7a6988c4b0..b5c20a65d1 100644 --- a/boost/container/node_allocator.hpp +++ b/boost/container/node_allocator.hpp @@ -74,19 +74,19 @@ class node_allocator typedef T * pointer; typedef const T * const_pointer; typedef typename ::boost::container:: - container_detail::unvoid_ref<T>::type reference; + dtl::unvoid_ref<T>::type reference; typedef typename ::boost::container:: - container_detail::unvoid_ref<const T>::type const_reference; + dtl::unvoid_ref<const T>::type const_reference; typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: version_type<self_t, Version> version; #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED - typedef boost::container::container_detail:: + typedef boost::container::dtl:: basic_multiallocation_chain<void*> multiallocation_chain_void; - typedef boost::container::container_detail:: + typedef boost::container::dtl:: transform_multiallocation_chain <multiallocation_chain_void, T> multiallocation_chain; #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED @@ -148,9 +148,9 @@ class node_allocator boost::container::throw_bad_alloc(); if(Version == 1 && count == 1){ - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool <sizeof(T), NodesPerBlock> shared_pool_t; - typedef container_detail::singleton_default<shared_pool_t> singleton_t; + typedef dtl::singleton_default<shared_pool_t> singleton_t; return pointer(static_cast<T*>(singleton_t::instance().allocate_node())); } else{ @@ -167,9 +167,9 @@ class node_allocator { (void)count; if(Version == 1 && count == 1){ - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool <sizeof(T), NodesPerBlock> shared_pool_t; - typedef container_detail::singleton_default<shared_pool_t> singleton_t; + typedef dtl::singleton_default<shared_pool_t> singleton_t; singleton_t::instance().deallocate_node(ptr); } else{ @@ -180,9 +180,9 @@ class node_allocator //!Deallocates all free blocks of the pool static void deallocate_free_blocks() BOOST_NOEXCEPT_OR_NOTHROW { - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool <sizeof(T), NodesPerBlock> shared_pool_t; - typedef container_detail::singleton_default<shared_pool_t> singleton_t; + typedef dtl::singleton_default<shared_pool_t> singleton_t; singleton_t::instance().deallocate_free_blocks(); } @@ -210,9 +210,9 @@ class node_allocator pointer allocate_one() { BOOST_STATIC_ASSERT(( Version > 1 )); - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool <sizeof(T), NodesPerBlock> shared_pool_t; - typedef container_detail::singleton_default<shared_pool_t> singleton_t; + typedef dtl::singleton_default<shared_pool_t> singleton_t; return (pointer)singleton_t::instance().allocate_node(); } @@ -221,9 +221,9 @@ class node_allocator void allocate_individual(std::size_t num_elements, multiallocation_chain &chain) { BOOST_STATIC_ASSERT(( Version > 1 )); - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool <sizeof(T), NodesPerBlock> shared_pool_t; - typedef container_detail::singleton_default<shared_pool_t> singleton_t; + typedef dtl::singleton_default<shared_pool_t> singleton_t; typename shared_pool_t::multiallocation_chain ch; singleton_t::instance().allocate_nodes(num_elements, ch); chain.incorporate_after(chain.before_begin(), (T*)&*ch.begin(), (T*)&*ch.last(), ch.size()); @@ -235,18 +235,18 @@ class node_allocator void deallocate_one(pointer p) BOOST_NOEXCEPT_OR_NOTHROW { BOOST_STATIC_ASSERT(( Version > 1 )); - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool <sizeof(T), NodesPerBlock> shared_pool_t; - typedef container_detail::singleton_default<shared_pool_t> singleton_t; + typedef dtl::singleton_default<shared_pool_t> singleton_t; singleton_t::instance().deallocate_node(p); } void deallocate_individual(multiallocation_chain &chain) BOOST_NOEXCEPT_OR_NOTHROW { BOOST_STATIC_ASSERT(( Version > 1 )); - typedef container_detail::shared_node_pool + typedef dtl::shared_node_pool <sizeof(T), NodesPerBlock> shared_pool_t; - typedef container_detail::singleton_default<shared_pool_t> singleton_t; + typedef dtl::singleton_default<shared_pool_t> singleton_t; typename shared_pool_t::multiallocation_chain ch(&*chain.begin(), &*chain.last(), chain.size()); singleton_t::instance().deallocate_nodes(ch); } |