update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / mon / ConfigMonitor.h

diff --git a/ceph/src/mon/ConfigMonitor.h b/ceph/src/mon/ConfigMonitor.h
index d46d8b9de726868379a71d6bde2249ae9a3ad9c3..e6c12a3d7f012d6bfdbbd1a934753b7cc82c4f0e 100644 (file)
--- a/ceph/src/mon/ConfigMonitor.h
+++ b/ceph/src/mon/ConfigMonitor.h
@@ -14,14 +14,16 @@ class ConfigMonitor : public PaxosService
 {
   version_t version = 0;
   ConfigMap config_map;
-  map<string,boost::optional<bufferlist>> pending;
-  string pending_description;
-  map<string,boost::optional<bufferlist>> pending_cleanup;
+  std::map<std::string,boost::optional<ceph::buffer::list>> pending;
+  std::string pending_description;
+  std::map<std::string,boost::optional<ceph::buffer::list>> pending_cleanup;
 
-  map<string,bufferlist> current;
+  std::map<std::string,ceph::buffer::list> current;
+
+  void encode_pending_to_kvmon();
 
 public:
-  ConfigMonitor(Monitor *m, Paxos *p, const string& service_name);
+  ConfigMonitor(Monitor &m, Paxos &p, const std::string& service_name);
 
   void init() override;