From fa016245146b1217d617ea2f7555e00945a48f84 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Mon, 30 Aug 2004 18:22:01 +0000 Subject: [PATCH] pool_allocator.h: Rename __pool_base to __pool_alloc_base. 2004-08-30 Benjamin Kosnik * include/ext/pool_allocator.h: Rename __pool_base to __pool_alloc_base. * src/allocator.cc: Same. * config/linker-map.gnu: Same. From-SVN: r86789 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/config/linker-map.gnu | 6 +++--- libstdc++-v3/include/ext/pool_allocator.h | 4 ++-- libstdc++-v3/src/allocator.cc | 18 +++++++++--------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 42385c2c422..2146613fcf7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2004-08-30 Benjamin Kosnik + + * 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 Kenneth C. Schalk diff --git a/libstdc++-v3/config/linker-map.gnu b/libstdc++-v3/config/linker-map.gnu index 71ffef62a49..80158d8cb37 100644 --- a/libstdc++-v3/config/linker-map.gnu +++ b/libstdc++-v3/config/linker-map.gnu @@ -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; diff --git a/libstdc++-v3/include/ext/pool_allocator.h b/libstdc++-v3/include/ext/pool_allocator.h index eec79e7070a..a744ea39b77 100644 --- a/libstdc++-v3/include/ext/pool_allocator.h +++ b/libstdc++-v3/include/ext/pool_allocator.h @@ -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 - class __pool_alloc : private __pool_base + class __pool_alloc : private __pool_alloc_base { private: static _Atomic_word _S_force_new; diff --git a/libstdc++-v3/src/allocator.cc b/libstdc++-v3/src/allocator.cc index e35aa3eef16..a0bf0ee65a7 100644 --- a/libstdc++-v3/src/allocator.cc +++ b/libstdc++-v3/src/allocator.cc @@ -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 -- 2.30.2