pool_allocator.h: Rename __pool_base to __pool_alloc_base.
2004-08-30 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pool_allocator.h: Rename __pool_base to __pool_alloc_base. * src/allocator.cc: Same. * config/linker-map.gnu: Same. From-SVN: r86789
This commit is contained in:
parent
88f1975682
commit
fa01624514
4 changed files with 21 additions and 14 deletions
|
@ -1,3 +1,10 @@
|
|||
2004-08-30 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* include/ext/pool_allocator.h: Rename __pool_base to
|
||||
__pool_alloc_base.
|
||||
* src/allocator.cc: Same.
|
||||
* config/linker-map.gnu: Same.
|
||||
|
||||
2004-08-30 Paolo Carlini <pcarlini@suse.de>
|
||||
Kenneth C. Schalk <ken@xorian.net>
|
||||
|
||||
|
|
|
@ -255,9 +255,9 @@ GLIBCXX_3.4.2 {
|
|||
|
||||
_ZN9__gnu_cxx18stdio_sync_filebufI[cw]St11char_traitsI[cw]EE4fileEv;
|
||||
|
||||
_ZN9__gnu_cxx11__pool_base9_M_refillE[jm];
|
||||
_ZN9__gnu_cxx11__pool_base16_M_get_free_listE[jm];
|
||||
_ZN9__gnu_cxx11__pool_base12_M_get_mutexEv;
|
||||
_ZN9__gnu_cxx17__pool_alloc_base9_M_refillE[jm];
|
||||
_ZN9__gnu_cxx17__pool_alloc_base16_M_get_free_listE[jm];
|
||||
_ZN9__gnu_cxx17__pool_alloc_base12_M_get_mutexEv;
|
||||
|
||||
} GLIBCXX_3.4.1;
|
||||
|
||||
|
|
|
@ -72,7 +72,7 @@ namespace __gnu_cxx
|
|||
* @endif
|
||||
* (See @link Allocators allocators info @endlink for more.)
|
||||
*/
|
||||
class __pool_base
|
||||
class __pool_alloc_base
|
||||
{
|
||||
protected:
|
||||
|
||||
|
@ -116,7 +116,7 @@ namespace __gnu_cxx
|
|||
|
||||
|
||||
template<typename _Tp>
|
||||
class __pool_alloc : private __pool_base
|
||||
class __pool_alloc : private __pool_alloc_base
|
||||
{
|
||||
private:
|
||||
static _Atomic_word _S_force_new;
|
||||
|
|
|
@ -44,22 +44,22 @@ namespace __gnu_internal
|
|||
namespace __gnu_cxx
|
||||
{
|
||||
// Definitions for __pool_alloc_base.
|
||||
__pool_base::_Obj* volatile*
|
||||
__pool_base::_M_get_free_list(size_t __bytes)
|
||||
__pool_alloc_base::_Obj* volatile*
|
||||
__pool_alloc_base::_M_get_free_list(size_t __bytes)
|
||||
{
|
||||
size_t __i = ((__bytes + (size_t)_S_align - 1) / (size_t)_S_align - 1);
|
||||
return _S_free_list + __i;
|
||||
}
|
||||
|
||||
mutex_type&
|
||||
__pool_base::_M_get_mutex()
|
||||
__pool_alloc_base::_M_get_mutex()
|
||||
{ return __gnu_internal::palloc_init_mutex; }
|
||||
|
||||
// Allocate memory in large chunks in order to avoid fragmenting the
|
||||
// heap too much. Assume that __n is properly aligned. We hold the
|
||||
// allocation lock.
|
||||
char*
|
||||
__pool_base::_M_allocate_chunk(size_t __n, int& __nobjs)
|
||||
__pool_alloc_base::_M_allocate_chunk(size_t __n, int& __nobjs)
|
||||
{
|
||||
char* __result;
|
||||
size_t __total_bytes = __n * __nobjs;
|
||||
|
@ -128,7 +128,7 @@ namespace __gnu_cxx
|
|||
// __n"'s free list. We assume that __n is properly aligned. We
|
||||
// hold the allocation lock.
|
||||
void*
|
||||
__pool_base::_M_refill(size_t __n)
|
||||
__pool_alloc_base::_M_refill(size_t __n)
|
||||
{
|
||||
int __nobjs = 20;
|
||||
char* __chunk = _M_allocate_chunk(__n, __nobjs);
|
||||
|
@ -159,11 +159,11 @@ namespace __gnu_cxx
|
|||
return __result;
|
||||
}
|
||||
|
||||
__pool_base::_Obj* volatile __pool_base::_S_free_list[_S_free_list_size];
|
||||
__pool_alloc_base::_Obj* volatile __pool_alloc_base::_S_free_list[_S_free_list_size];
|
||||
|
||||
char* __pool_base::_S_start_free = 0;
|
||||
char* __pool_alloc_base::_S_start_free = 0;
|
||||
|
||||
char* __pool_base::_S_end_free = 0;
|
||||
char* __pool_alloc_base::_S_end_free = 0;
|
||||
|
||||
size_t __pool_base::_S_heap_size = 0;
|
||||
size_t __pool_alloc_base::_S_heap_size = 0;
|
||||
} // namespace __gnu_cxx
|
||||
|
|
Loading…
Add table
Reference in a new issue