diff options
Diffstat (limited to 'indexlib')
| -rw-r--r-- | indexlib/manager.h | 6 | ||||
| -rw-r--r-- | indexlib/mempool.h | 2 | ||||
| -rw-r--r-- | indexlib/mempool.tcc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/indexlib/manager.h b/indexlib/manager.h index 6224a9db4..3dc1bdef6 100644 --- a/indexlib/manager.h +++ b/indexlib/manager.h @@ -56,12 +56,12 @@ class memory_manager { virtual void resize( unsigned ) = 0; }; -template <memory_manager* ( *get_tqparent )()> +template <memory_manager* ( *get_parent )()> struct thing_manager { public: - const unsigned char* ronly_base( unsigned idx ) const { return get_tqparent()->ronly_base( idx ); } - unsigned char* rw_base( unsigned idx ) const { return get_tqparent()->rw_base( idx ); } + const unsigned char* ronly_base( unsigned idx ) const { return get_parent()->ronly_base( idx ); } + unsigned char* rw_base( unsigned idx ) const { return get_parent()->rw_base( idx ); } }; diff --git a/indexlib/mempool.h b/indexlib/mempool.h index fca5596d5..acf624948 100644 --- a/indexlib/mempool.h +++ b/indexlib/mempool.h @@ -127,7 +127,7 @@ struct mempool /* : boost::noncopyable */ { }; START_THING( list_node, thing<list_node_manager> ) - void set_tqparent( const mempool* p ) { this->parent_ = p; } + void set_parent( const mempool* p ) { this->parent_ = p; } MEMBER( uint16_t, order, 0 ) MEMBER( uint32_t, next, 2 ) MEMBER( uint32_t, prev, 6 ) diff --git a/indexlib/mempool.tcc b/indexlib/mempool.tcc index fcb65942c..19a5e6d44 100644 --- a/indexlib/mempool.tcc +++ b/indexlib/mempool.tcc @@ -142,7 +142,7 @@ template <typename Traits> typename mempool<Traits>::list_nodeptr mempool<Traits>::get_node( uint32_t p ) const { assert( p ); list_nodeptr res = list_nodeptr::cast_from_uint32( p + Traits::type_offset() ); - res->set_tqparent( this ); + res->set_parent( this ); return res; } |