From 9dcec1feba68dc5ba38cdc634f5bf113c0f77348 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 6 Apr 2013 13:14:45 +0200 Subject: tagging yhttpd-0.7.2 --- src/maps/hashmap.h | 14 +++++++------- src/maps/nhashmap.h | 8 ++++---- src/maps/shashmap.h | 12 ++++++------ src/maps/shashmap.tmpl | 8 +++----- 4 files changed, 20 insertions(+), 22 deletions(-) (limited to 'src/maps') diff --git a/src/maps/hashmap.h b/src/maps/hashmap.h index b3a3212..1bdc515 100644 --- a/src/maps/hashmap.h +++ b/src/maps/hashmap.h @@ -6,13 +6,13 @@ using namespace std; template -struct compare_allocator +struct compare_allocator { inline bool operator()(key_type_ t_key_1, key_type_ t_key_2) const; }; template -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, -class alloc_type = compare_allocator + class obj_type, + class key_type_ = string, + class hash_type = size_hash, + class alloc_type = compare_allocator > struct hashmap : public __gnu_cxx::hash_map { @@ -42,7 +42,7 @@ struct hashmap : public __gnu_cxx::hash_map* 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 f440230..7f17a55 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, -class alloc_type = compare_allocator + class obj_type, + class key_type_ = string, + class hash_type = size_hash, + class alloc_type = compare_allocator > struct nhashmap : public shashmap { diff --git a/src/maps/shashmap.h b/src/maps/shashmap.h index f692e32..99dd7c8 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, -class alloc_type = compare_allocator + class obj_type, + class key_type_ = string, + class hash_type = size_hash, + class alloc_type = compare_allocator > class shashmap : protected hashmap, - 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 0bd5796..c864d28 100644 --- a/src/maps/shashmap.tmpl +++ b/src/maps/shashmap.tmpl @@ -43,7 +43,7 @@ shashmap::get_or_callback_set { pthread_mutex_lock( &mut_shashmap ); obj_type t_ret = hashmap::get_or_callback_set - (func, p_void, t_key); + (func, p_void, t_key); pthread_mutex_unlock( &mut_shashmap ); return t_ret; } @@ -144,14 +144,12 @@ template void shashmap::dumpit() { - dumpable::add - ("[shashmap]"); + dumpable::add("[shashmap]"); vector* p_vec = get_key_vector(); typename vector::iterator iter; for (iter = p_vec->begin(); iter != p_vec->end(); ++iter) - dumpable::add - (*iter); + dumpable::add(*iter); delete p_vec; } -- cgit v1.2.3