1 files changed, 40 insertions, 11 deletions
diff --git a/src/maps/hashmap.h b/src/maps/hashmap.h
index a748bd8..b3a3212 100644
--- a/src/maps/hashmap.h
+++ b/src/maps/hashmap.h
@@ -2,22 +2,51 @@
 #define HASHMAP_H
 
 #include <ext/hash_map>
-#include "hash.h"
 
 using namespace std;
 
-using __gnu_cxx::hash_map;
+template<class key_type_>
+struct compare_allocator
+{
+  inline bool operator()(key_type_ t_key_1, key_type_ t_key_2) const;
+};
+
+template<class key_type_>
+struct equals_allocator
+{
+  inline bool operator()(key_type_ t_key_1, key_type_ t_key_2) const;
+};
+
+template<class key_type_>
+struct size_hash
+{
+  inline int operator()(key_type_ t_key) const;
+};
+
+template<class key_type_>
+struct self_hash
+{
+  inline int operator()(key_type_ t_key) const;
+};
 
-template<class obj_type>
-struct hashmap : public hash_map< string, obj_type, hash, hashmap_allocator>
+template
+<
+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>
 {
- virtual inline void set_elem(obj_type t_obj, string s_key);
- virtual inline obj_type get_elem(string s_key);
- virtual inline obj_type get_set_elem(obj_type t_obj, string s_key);
- virtual inline vector<string>* get_key_vector();
- virtual inline bool exists(string s_key);
- virtual inline void run_func( void (*func)(obj_type) );
- virtual inline void run_func( void (*func)(obj_type, void*), void* v_arg );
+  virtual inline void set_elem(obj_type t_obj, key_type_ t_key);
+  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);
+  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) );
+  virtual inline void run_func( void (*func)(obj_type, void*), void* v_arg );
 };
 
 #include "hashmap.tmpl"