import 15.2.0 Octopus source

[ceph.git] / ceph / src / common / bloom_filter.hpp

diff --git a/ceph/src/common/bloom_filter.hpp b/ceph/src/common/bloom_filter.hpp
index 8484d4edbe89250b46e81b6db19647924ba2fc33..e468275a7b6baa0b4243ac565a683bf7d6db7ff4 100644 (file)
--- a/ceph/src/common/bloom_filter.hpp
+++ b/ceph/src/common/bloom_filter.hpp
@@ -180,13 +180,6 @@ public:
     ++insert_count_;
   }
 
-  template<typename T>
-  inline void insert(const T& t)
-  {
-    // Note: T must be a C++ POD type.
-    insert(reinterpret_cast<const unsigned char*>(&t),sizeof(T));
-  }
-
   inline void insert(const std::string& key)
   {
     insert(reinterpret_cast<const unsigned char*>(key.c_str()),key.size());
@@ -251,12 +244,6 @@ public:
     return true;
   }
 
-  template<typename T>
-  inline bool contains(const T& t) const
-  {
-    return contains(reinterpret_cast<const unsigned char*>(&t),static_cast<std::size_t>(sizeof(T)));
-  }
-
   inline bool contains(const std::string& key) const
   {
     return contains(reinterpret_cast<const unsigned char*>(key.c_str()),key.size());
@@ -519,9 +506,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 +603,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)