better logging (maybe) and exception handling

[chaz/yoink] / src / Moof / Hash.hh

diff --git a/src/Moof/Hash.hh b/src/Moof/Hash.hh
index c0695447ab303f6438b264fc4b2e9141fb0ad661..f0fab50705aca13e9c554d5eb14c0c161a36699e 100644 (file)
--- a/src/Moof/Hash.hh
+++ b/src/Moof/Hash.hh
@@ -37,13 +37,19 @@
 namespace Mf {
 
 
 namespace Mf {
 
 

-unsigned MurmurHash2_(const void* key, int len, unsigned seed);
-
-struct hash_string
+struct getHash

 {
 {

+       // generic hash function
+       unsigned operator()(const void* key, int len, unsigned seed = -1) const;
+

        inline unsigned operator()(const std::string& val) const
        {
        inline unsigned operator()(const std::string& val) const
        {

-               return MurmurHash2_(val.data(), val.length(), -1);
+               return (*this)(val.data(), val.length());
+       }
+
+       inline unsigned operator()(int val) const
+       {
+               return val;

        }
 };
 
        }
 };