update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / messages / MMonQuorumService.h

diff --git a/ceph/src/messages/MMonQuorumService.h b/ceph/src/messages/MMonQuorumService.h
index a2cf527b5ecd4398bfef335304c18d7c3a9db309..23de9af51f5cf46e9d0e4b33720f7ea53753924c 100644 (file)
--- a/ceph/src/messages/MMonQuorumService.h
+++ b/ceph/src/messages/MMonQuorumService.h
@@ -25,7 +25,7 @@ protected:
   MMonQuorumService(int type, int head)
     : Message{type, head, 1}
   {}
-  ~MMonQuorumService() override { }
+  ~MMonQuorumService() override {}
 
 public:
   void set_epoch(epoch_t e) {
@@ -50,7 +50,8 @@ public:
     encode(round, payload);
   }
 
-  void service_decode(bufferlist::const_iterator &p) {
+  void service_decode(ceph::buffer::list::const_iterator &p) {
+    using ceph::decode;
     decode(epoch, p);
     decode(round, p);
   }