tagging ychat-0.7.7.0ychat-0.7.7.0

1 files changed, 11 insertions, 20 deletions

diff --git a/src/maps/shashmap.h b/src/maps/shashmap.h
index 6152ba2..e31b55f 100644
--- a/src/maps/shashmap.h
+++ b/src/maps/shashmap.h
@@ -6,34 +6,25 @@
 
 using namespace std;
 
-template
-<
-  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>
+template<class obj_type>
+class shashmap : public hashmap<obj_type>
 {
 private:
   pthread_mutex_t mut_shashmap;
-
 public:
   explicit shashmap();
   ~shashmap();
-  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);
-  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);
-  virtual inline void del_elem(key_type_ t_key);
-  virtual inline void del_elem_insecure(key_type_ t_key);
+  virtual inline void set_elem(obj_type t_obj, string s_key);
+  virtual inline obj_type get_set_elem(obj_type t_obj, string s_key);
+  virtual inline void add_elem(obj_type t_obj, string s_key);
+  virtual inline void add_elem_insecure(obj_type t_obj, string s_key);
+  virtual inline obj_type get_elem(string s_key);
+  virtual inline void del_elem(string s_key);
+  virtual inline void del_elem_insecure(string s_key);
   virtual inline void clear();
   virtual inline int size();
-  virtual inline bool exists(key_type_ t_key);
-  virtual inline vector<key_type_>* get_key_vector();
+  virtual inline bool exists(string s_key);
+  virtual inline vector<string>* 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 );
 };