diff options
Diffstat (limited to 'boost/interprocess/allocators/cached_node_allocator.hpp')
| -rw-r--r-- | boost/interprocess/allocators/cached_node_allocator.hpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/boost/interprocess/allocators/cached_node_allocator.hpp b/boost/interprocess/allocators/cached_node_allocator.hpp index b0ad0e4ebc..5ac6aab2c0 100644 --- a/boost/interprocess/allocators/cached_node_allocator.hpp +++ b/boost/interprocess/allocators/cached_node_allocator.hpp @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////////// // -// (C) Copyright Ion Gaztanaga 2005-2011. Distributed under the Boost +// (C) Copyright Ion Gaztanaga 2005-2012. Distributed under the Boost // Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // @@ -11,7 +11,7 @@ #ifndef BOOST_INTERPROCESS_CACHED_NODE_ALLOCATOR_HPP #define BOOST_INTERPROCESS_CACHED_NODE_ALLOCATOR_HPP -#if (defined _MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma once #endif @@ -34,7 +34,7 @@ namespace boost { namespace interprocess { -/// @cond +#if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED) namespace ipcdetail { @@ -64,7 +64,7 @@ class cached_node_allocator_v1 template<class T2> struct rebind - { + { typedef cached_node_allocator_v1 <T2, SegmentManager, NodesPerBlock> other; }; @@ -86,14 +86,14 @@ class cached_node_allocator_v1 } //namespace ipcdetail{ -/// @endcond +#endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED template < class T , class SegmentManager , std::size_t NodesPerBlock > class cached_node_allocator - /// @cond + #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED) : public ipcdetail::cached_allocator_impl < T , ipcdetail::shared_node_pool @@ -102,7 +102,7 @@ class cached_node_allocator , NodesPerBlock > , 2> - /// @endcond + #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED { #ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED @@ -122,7 +122,7 @@ class cached_node_allocator template<class T2> struct rebind - { + { typedef cached_node_allocator<T2, SegmentManager, NodesPerBlock> other; }; @@ -155,7 +155,7 @@ class cached_node_allocator //!cached_node_allocator template<class T2> struct rebind - { + { typedef cached_node_allocator<T2, SegmentManager> other; }; @@ -252,12 +252,12 @@ class cached_node_allocator //!preferred_elements. The number of actually allocated elements is //!will be assigned to received_size. The elements must be deallocated //!with deallocate(...) - multiallocation_chain allocate_many(size_type elem_size, size_type num_elements); + void allocate_many(size_type elem_size, size_type num_elements, multiallocation_chain &chain); //!Allocates n_elements elements, each one of size elem_sizes[i]in a //!contiguous block //!of memory. The elements must be deallocated - multiallocation_chain allocate_many(const size_type *elem_sizes, size_type n_elements); + void allocate_many(const size_type *elem_sizes, size_type n_elements, multiallocation_chain &chain); //!Allocates many elements of size elem_size in a contiguous block //!of memory. The minimum number to be allocated is min_elements, @@ -265,7 +265,7 @@ class cached_node_allocator //!preferred_elements. The number of actually allocated elements is //!will be assigned to received_size. The elements must be deallocated //!with deallocate(...) - void deallocate_many(multiallocation_chain chain); + void deallocate_many(multiallocation_chain &chain); //!Allocates just one object. Memory allocated with this function //!must be deallocated only with deallocate_one(). |