From: Loic Dachary <loic@dachary.org>
Date: Mon, 7 Oct 2013 21:05:01 +0000 (+0200)
Subject: common: unintended use of the wrong bloom_filter prototype
X-Git-Tag: v0.72-rc1~92^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F697%2Fhead;p=ceph.git

common: unintended use of the wrong bloom_filter prototype

For encoding/decoding test purposes. The generate_test_instances should
be improved to cover more encoding/decoding cases.

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/common/bloom_filter.cc b/src/common/bloom_filter.cc
index a1c20bf0c12c..68875e925bf6 100644
--- a/src/common/bloom_filter.cc
+++ b/src/common/bloom_filter.cc
@@ -66,11 +66,11 @@ void bloom_filter::dump(Formatter *f) const
 
 void bloom_filter::generate_test_instances(list<bloom_filter*>& ls)
 {
-  ls.push_back(new bloom_filter(10, .5, 1, 5));
-  ls.push_back(new bloom_filter(10, .5, 1, 5));
+  ls.push_back(new bloom_filter(10, .5, 1));
+  ls.push_back(new bloom_filter(10, .5, 1));
   ls.back()->insert("foo");
   ls.back()->insert("bar");
-  ls.push_back(new bloom_filter(50, .5, 1, 5));
+  ls.push_back(new bloom_filter(50, .5, 1));
   ls.back()->insert("foo");
   ls.back()->insert("bar");
   ls.back()->insert("baz");
@@ -123,11 +123,11 @@ void compressible_bloom_filter::dump(Formatter *f) const
 
 void compressible_bloom_filter::generate_test_instances(list<compressible_bloom_filter*>& ls)
 {
-  ls.push_back(new compressible_bloom_filter(10, .5, 1, 4));
-  ls.push_back(new compressible_bloom_filter(10, .5, 1, 4));
+  ls.push_back(new compressible_bloom_filter(10, .5, 1));
+  ls.push_back(new compressible_bloom_filter(10, .5, 1));
   ls.back()->insert("foo");
   ls.back()->insert("bar");
-  ls.push_back(new compressible_bloom_filter(50, .5, 1, 4));
+  ls.push_back(new compressible_bloom_filter(50, .5, 1));
   ls.back()->insert("foo");
   ls.back()->insert("bar");
   ls.back()->insert("baz");