update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / test / ObjectMap / KeyValueDBMemory.h

diff --git a/ceph/src/test/ObjectMap/KeyValueDBMemory.h b/ceph/src/test/ObjectMap/KeyValueDBMemory.h
index 415399e0a30dce4e44472080512b126bc23eee4b..5e7d3f0e1675f33f7c171ba1ce8d5df5672e3577 100644 (file)
--- a/ceph/src/test/ObjectMap/KeyValueDBMemory.h
+++ b/ceph/src/test/ObjectMap/KeyValueDBMemory.h
@@ -21,10 +21,10 @@ public:
   int init(string _opt) override {
     return 0;
   }
-  int open(std::ostream &out, const vector<ColumnFamily>& cfs = {}) override {
+  int open(std::ostream &out, const std::string& cfs="") override {
     return 0;
   }
-  int create_and_open(ostream &out, const vector<ColumnFamily>& cfs = {}) override {
+  int create_and_open(ostream &out, const std::string& cfs="") override {
     return 0;
   }
 
@@ -186,5 +186,5 @@ private:
   friend class WholeSpaceMemIterator;
 
 public:
-  WholeSpaceIterator get_wholespace_iterator() override;
+  WholeSpaceIterator get_wholespace_iterator(IteratorOpts opts = 0) override;
 };