update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MOSDPGReadyToMerge.h b/ceph/src/messages/MOSDPGReadyToMerge.h
index e8f3b81bb88c53e69898ad5134ccf070f3a47cbd..e75212638535ff42bccec0be08a8f419bad4b5c8 100644 (file)
--- a/ceph/src/messages/MOSDPGReadyToMerge.h
+++ b/ceph/src/messages/MOSDPGReadyToMerge.h
@@ -35,7 +35,8 @@ public:
     encode(ready, payload);
   }
   void decode_payload() override {
-    bufferlist::const_iterator p = payload.begin();
+    using ceph::decode;
+    auto p = payload.cbegin();
     paxos_decode(p);
     decode(pgid, p);
     decode(source_version, p);
@@ -45,7 +46,7 @@ public:
     decode(ready, p);
   }
   std::string_view get_type_name() const override { return "osd_pg_ready_to_merge"; }
-  void print(ostream &out) const {
+  void print(std::ostream &out) const {
     out << get_type_name()
         << "(" << pgid
        << " sv " << source_version