From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 29 Mar 2019 01:17:03 +0000 (-0400)
Subject: common: Update bloom_filter.hpp to work without using namespace
X-Git-Tag: v15.0.0~19^2~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8034dcc1e6b4adca1bab3fc6efd3d288f435cf5d;p=ceph.git

common: Update bloom_filter.hpp to work without using namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/common/bloom_filter.hpp b/src/common/bloom_filter.hpp
index 8484d4edbe89..3cd9d4151ee2 100644
--- a/src/common/bloom_filter.hpp
+++ b/src/common/bloom_filter.hpp
@@ -519,9 +519,9 @@ protected:
   }
 
 public:
-  void encode(bufferlist& bl) const;
-  void decode(bufferlist::const_iterator& bl);
-  void dump(Formatter *f) const;
+  void encode(ceph::buffer::list& bl) const;
+  void decode(ceph::buffer::list::const_iterator& bl);
+  void dump(ceph::Formatter *f) const;
   static void generate_test_instances(std::list<bloom_filter*>& ls);
 };
 WRITE_CLASS_ENCODER(bloom_filter)
@@ -616,9 +616,9 @@ private:
 
   std::vector<std::size_t> size_list;
 public:
-  void encode(bufferlist& bl) const;
-  void decode(bufferlist::const_iterator& bl);
-  void dump(Formatter *f) const;
+  void encode(ceph::bufferlist& bl) const;
+  void decode(ceph::bufferlist::const_iterator& bl);
+  void dump(ceph::Formatter *f) const;
   static void generate_test_instances(std::list<compressible_bloom_filter*>& ls);
 };
 WRITE_CLASS_ENCODER(compressible_bloom_filter)