update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MOSDMarkMeDead.h b/ceph/src/messages/MOSDMarkMeDead.h
index 9e8b306fcdc5bf37f92aad0782ff64a731876970..35f98805564dd673ce42bc3ebc366f7770d49dc6 100644 (file)
--- a/ceph/src/messages/MOSDMarkMeDead.h
+++ b/ceph/src/messages/MOSDMarkMeDead.h
@@ -5,7 +5,7 @@
 
 #include "messages/PaxosServiceMessage.h"
 
-class MOSDMarkMeDead : public PaxosServiceMessage {
+class MOSDMarkMeDead final : public PaxosServiceMessage {
 private:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
@@ -25,12 +25,13 @@ private:
       fsid(fs), target_osd(osd),
       epoch(e) {}
  private:
-  ~MOSDMarkMeDead() override {}
+  ~MOSDMarkMeDead() final {}
 
 public:
   epoch_t get_epoch() const { return epoch; }
 
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     paxos_decode(p);
     decode(fsid, p);
@@ -49,7 +50,7 @@ public:
   }
 
   std::string_view get_type_name() const override { return "MOSDMarkMeDead"; }
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "MOSDMarkMeDead("
        << "osd." << target_osd
        << ", epoch " << epoch