diff options
| author | Paul Buetow <paul@buetow.org> | 2013-04-06 13:14:48 +0200 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2013-04-06 13:14:48 +0200 |
| commit | 4ecbf33fae730bc79c4a47e6efda615b104754ad (patch) | |
| tree | dd59412b6d8bea88995211f60b786728ac30acc4 /src/maps | |
| parent | bf5fc4cc4a15e8e57db58c2e065e0f5adbd8e800 (diff) | |
tagging ychat-0.7.8ychat-0.7.8
Diffstat (limited to 'src/maps')
| -rw-r--r-- | src/maps/CVS/Entries | 16 | ||||
| -rw-r--r-- | src/maps/shashmap.h | 9 | ||||
| -rw-r--r-- | src/maps/shashmap.tmpl | 14 |
3 files changed, 9 insertions, 30 deletions
diff --git a/src/maps/CVS/Entries b/src/maps/CVS/Entries index b0587e6..991bf8b 100644 --- a/src/maps/CVS/Entries +++ b/src/maps/CVS/Entries @@ -1,9 +1,9 @@ -/hmap.h/1.7/Thu Nov 18 13:41:47 2004// -/hmap.tmpl/1.7/Fri Jan 7 21:00:19 2005// -/mtools.h/1.4/Fri Jan 7 21:00:19 2005// -/mtools.tmpl/1.3/Thu Nov 18 13:41:47 2004// -/nmap.h/1.4/Fri Jan 7 21:00:19 2005// -/nmap.tmpl/1.3/Thu Nov 18 13:41:47 2004// -/smap.h/1.9/Fri Jan 7 21:00:19 2005// -/smap.tmpl/1.8/Fri Jan 7 21:00:19 2005// +/hashmap.h/1.12/Fri Mar 4 21:00:44 2005// +/hashmap.tmpl/1.6/Fri Mar 4 21:00:44 2005// +/mtools.h/1.7/Mon Feb 21 01:55:49 2005// +/mtools.tmpl/1.6/Mon Feb 21 01:55:49 2005// +/nhashmap.h/1.5/Fri Mar 4 21:00:44 2005// +/nhashmap.tmpl/1.4/Fri Mar 4 21:00:44 2005// +/shashmap.h/1.8/Fri Mar 4 21:00:44 2005// +/shashmap.tmpl/1.6/Fri Mar 4 21:00:45 2005// D diff --git a/src/maps/shashmap.h b/src/maps/shashmap.h index 99dd7c8..6152ba2 100644 --- a/src/maps/shashmap.h +++ b/src/maps/shashmap.h @@ -4,8 +4,6 @@ #include <pthread.h> #include "hashmap.h" -#include "../monitor/dump.h" - using namespace std; template @@ -15,15 +13,11 @@ template 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 +class shashmap : protected hashmap<obj_type, key_type_, hash_type, alloc_type> { private: pthread_mutex_t mut_shashmap; -protected: - virtual void dumpit(); - public: explicit shashmap(); ~shashmap(); @@ -42,7 +36,6 @@ public: virtual inline vector<key_type_>* get_key_vector(); virtual inline void run_func( void (*func)(obj_type) ); virtual inline void run_func( void (*func)(obj_type, void*), void* v_arg ); - }; #include "shashmap.tmpl" diff --git a/src/maps/shashmap.tmpl b/src/maps/shashmap.tmpl index c864d28..4559284 100644 --- a/src/maps/shashmap.tmpl +++ b/src/maps/shashmap.tmpl @@ -139,17 +139,3 @@ shashmap<obj_type, key_type_, hash_type, alloc_type>::run_func( void (*func)(obj hashmap<obj_type, key_type_, hash_type, alloc_type>::run_func(func, v_arg); pthread_mutex_unlock( &mut_shashmap ); } - -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]"); - 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); - - delete p_vec; -} |