diff options
Diffstat (limited to 'src/maps')
| -rw-r--r-- | src/maps/hashmap.h | 14 | ||||
| -rw-r--r-- | src/maps/nhashmap.h | 8 | ||||
| -rw-r--r-- | src/maps/shashmap.h | 12 | ||||
| -rw-r--r-- | src/maps/shashmap.tmpl | 8 |
4 files changed, 22 insertions, 20 deletions
diff --git a/src/maps/hashmap.h b/src/maps/hashmap.h index 1bdc515..b3a3212 100644 --- a/src/maps/hashmap.h +++ b/src/maps/hashmap.h @@ -6,13 +6,13 @@ using namespace std; template<class key_type_> -struct compare_allocator +struct compare_allocator { inline bool operator()(key_type_ t_key_1, key_type_ t_key_2) const; }; template<class key_type_> -struct equals_allocator +struct equals_allocator { inline bool operator()(key_type_ t_key_1, key_type_ t_key_2) const; }; @@ -31,10 +31,10 @@ struct self_hash template < - class obj_type, - class key_type_ = string, - class hash_type = size_hash<string>, - class alloc_type = compare_allocator<string> +class obj_type, +class key_type_ = string, +class hash_type = size_hash<string>, +class alloc_type = compare_allocator<string> > struct hashmap : public __gnu_cxx::hash_map<key_type_, obj_type, hash_type, alloc_type> { @@ -42,7 +42,7 @@ struct hashmap : public __gnu_cxx::hash_map<key_type_, obj_type, hash_type, allo virtual inline obj_type get_elem(key_type_ t_key); virtual inline obj_type get_set_elem(obj_type t_obj, key_type_ t_key); virtual inline obj_type get_or_callback_set - (obj_type (*func)(void*), void* p_void, key_type_ t_key); + (obj_type (*func)(void*), void* p_void, key_type_ t_key); virtual inline vector<key_type_>* get_key_vector(); virtual inline bool exists(key_type_ t_key); virtual inline void run_func( void (*func)(obj_type) ); diff --git a/src/maps/nhashmap.h b/src/maps/nhashmap.h index 7f17a55..f440230 100644 --- a/src/maps/nhashmap.h +++ b/src/maps/nhashmap.h @@ -7,10 +7,10 @@ using namespace std; template < - class obj_type, - class key_type_ = string, - class hash_type = size_hash<string>, - class alloc_type = compare_allocator<string> +class obj_type, +class key_type_ = string, +class hash_type = size_hash<string>, +class alloc_type = compare_allocator<string> > struct nhashmap : public shashmap<obj_type, key_type_, hash_type, alloc_type> { diff --git a/src/maps/shashmap.h b/src/maps/shashmap.h index 99dd7c8..f692e32 100644 --- a/src/maps/shashmap.h +++ b/src/maps/shashmap.h @@ -10,13 +10,13 @@ using namespace std; template < - class obj_type, - class key_type_ = string, - class hash_type = size_hash<string>, - class alloc_type = compare_allocator<string> +class obj_type, +class key_type_ = string, +class hash_type = size_hash<string>, +class alloc_type = compare_allocator<string> > class shashmap : protected hashmap<obj_type, key_type_, hash_type, alloc_type>, - public dumpable + public dumpable { private: pthread_mutex_t mut_shashmap; @@ -30,7 +30,7 @@ public: virtual inline void set_elem(obj_type t_obj, key_type_ t_key); virtual inline obj_type get_set_elem(obj_type t_obj, key_type_ t_key); virtual inline obj_type get_or_callback_set - (obj_type (*func)(void*), void* p_void, key_type_ t_key); + (obj_type (*func)(void*), void* p_void, key_type_ t_key); virtual inline void add_elem(obj_type t_obj, key_type_ t_key); virtual inline void add_elem_insecure(obj_type t_obj, key_type_ t_key); virtual inline obj_type get_elem(key_type_ t_key); diff --git a/src/maps/shashmap.tmpl b/src/maps/shashmap.tmpl index c864d28..0bd5796 100644 --- a/src/maps/shashmap.tmpl +++ b/src/maps/shashmap.tmpl @@ -43,7 +43,7 @@ shashmap<obj_type, key_type_, hash_type, alloc_type>::get_or_callback_set { pthread_mutex_lock( &mut_shashmap ); obj_type t_ret = hashmap<obj_type, key_type_, hash_type, alloc_type>::get_or_callback_set - (func, p_void, t_key); + (func, p_void, t_key); pthread_mutex_unlock( &mut_shashmap ); return t_ret; } @@ -144,12 +144,14 @@ template<class obj_type, class key_type_, class hash_type, class alloc_type> void shashmap<obj_type, key_type_, hash_type, alloc_type>::dumpit() { - dumpable::add("[shashmap]"); + dumpable::add + ("[shashmap]"); vector<key_type_>* p_vec = get_key_vector(); typename vector<key_type_>::iterator iter; for (iter = p_vec->begin(); iter != p_vec->end(); ++iter) - dumpable::add(*iter); + dumpable::add + (*iter); delete p_vec; } |
