From fcf1807fc8ac320a6c787360e8b78509b58b0a5a Mon Sep 17 00:00:00 2001
From: Matthias Vallentin <vallentin@icir.org>
Date: Thu, 6 Jun 2013 13:39:00 -0700
Subject: [PATCH] Fix hasher usage and narrow interface.

---
 src/BloomFilter.cc |  4 ++--
 src/BloomFilter.h  | 10 +---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/BloomFilter.cc b/src/BloomFilter.cc
index 7c347927c3..c684c82c0e 100644
--- a/src/BloomFilter.cc
+++ b/src/BloomFilter.cc
@@ -93,8 +93,8 @@ HashPolicy::HashVector DefaultHashing::Hash(const void* x, size_t n) const
 
 HashPolicy::HashVector DoubleHashing::Hash(const void* x, size_t n) const
   {
-  HashType h1 = hasher1_(x);
-  HashType h2 = hasher2_(x);
+  HashType h1 = hasher1_(x, n);
+  HashType h2 = hasher2_(x, n);
   HashVector h(K(), 0);
   for ( size_t i = 0; i < h.size(); ++i )
     h[i] = h1 + i * h2;
diff --git a/src/BloomFilter.h b/src/BloomFilter.h
index 3e2bd5de90..fd1cb31d61 100644
--- a/src/BloomFilter.h
+++ b/src/BloomFilter.h
@@ -96,15 +96,7 @@ protected:
    */
   class Hasher {
   public:
-    template <typename T>
-    HashType operator()(const T& x) const
-      {
-      return h3_(&x, sizeof(x));
-      }
-    HashType operator()(const void* x, size_t n) const
-      {
-      return h3_(x, n);
-      }
+    HashType operator()(const void* x, size_t n) const { return h3_(x, n); }
   private:
     // FIXME: The hardcoded value of 36 comes from UHASH_KEY_SIZE defined in
     // Hash.h. I do not know how this value impacts the hash function behavior