boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-03 14:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gjasny-fix-declaration-changes-meaning' into develop

Browse Source
This commit is contained in:
Ion Gaztañaga
2015-12-23 10:10:53 +01:00
parent 08e768f1d8 a4e9686f8a
commit 12e1243543
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pool_resource.cpp
View File

@@ -32,11 +32,11 @@ namespace pmr {
class pool_data_t class pool_data_t
: public block_slist_base<> : public block_slist_base<>
{ {
typedef block_slist_base<> block_slist_base; typedef block_slist_base<> block_slist_base_t;
public: public:
explicit pool_data_t(std::size_t initial_blocks_per_chunk) explicit pool_data_t(std::size_t initial_blocks_per_chunk)
: block_slist_base(), next_blocks_per_chunk(initial_blocks_per_chunk) : block_slist_base_t(), next_blocks_per_chunk(initial_blocks_per_chunk)
{ slist_algo::init_header(&free_slist); } { slist_algo::init_header(&free_slist); }
void *allocate_block() BOOST_NOEXCEPT void *allocate_block() BOOST_NOEXCEPT
@@ -59,7 +59,7 @@ class pool_data_t
void release(memory_resource &upstream) void release(memory_resource &upstream)
{ {
slist_algo::init_header(&free_slist); slist_algo::init_header(&free_slist);
this->block_slist_base::release(upstream); this->block_slist_base_t::release(upstream);
next_blocks_per_chunk = pool_options_minimum_max_blocks_per_chunk; next_blocks_per_chunk = pool_options_minimum_max_blocks_per_chunk;
} }
@@ -72,7 +72,7 @@ class pool_data_t
//Minimum block size is at least max_align, so all pools allocate sizes that are multiple of max_align, //Minimum block size is at least max_align, so all pools allocate sizes that are multiple of max_align,
//meaning that all blocks are max_align-aligned. //meaning that all blocks are max_align-aligned.
char *p = static_cast<char *>(block_slist_base::allocate(blocks_per_chunk*pool_block, mr)); char *p = static_cast<char *>(block_slist_base_t::allocate(blocks_per_chunk*pool_block, mr));
//Create header types. This is no-throw //Create header types. This is no-throw
for(std::size_t i = 0, max = blocks_per_chunk; i != max; ++i){ for(std::size_t i = 0, max = blocks_per_chunk; i != max; ++i){