Skip to content

Commit

Permalink
Fix declaration changes meaning error with GCC 4.4.7 (#11856)
Browse files Browse the repository at this point in the history
  • Loading branch information
jupp0r authored and gjasny committed Dec 23, 2015
1 parent 08e768f commit a4e9686
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/pool_resource.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ namespace pmr {
class pool_data_t
: public block_slist_base<>
{
typedef block_slist_base<> block_slist_base;
typedef block_slist_base<> block_slist_base_t;

public:
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); }

void *allocate_block() BOOST_NOEXCEPT
Expand All @@ -59,7 +59,7 @@ class pool_data_t
void release(memory_resource &upstream)
{
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;
}

Expand All @@ -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,
//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
for(std::size_t i = 0, max = blocks_per_chunk; i != max; ++i){
Expand Down

0 comments on commit a4e9686

Please sign in to comment.