update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MMonHealth.h b/ceph/src/messages/MMonHealth.h
index 1d4fd73174cf0a4be83e836ba3afbed996a04fa3..9f5d4084ccbce3a4a04e196367fd0b7782273ee4 100644 (file)
--- a/ceph/src/messages/MMonHealth.h
+++ b/ceph/src/messages/MMonHealth.h
@@ -18,7 +18,7 @@
 #include "messages/MMonQuorumService.h"
 #include "mon/mon_types.h"
 
-class MMonHealth : public MMonQuorumService {
+class MMonHealth final : public MMonQuorumService {
 public:
   static constexpr int HEAD_VERSION = 1;
 
@@ -31,11 +31,11 @@ public:
   MMonHealth() : MMonQuorumService{MSG_MON_HEALTH, HEAD_VERSION} { }
 
 private:
-  ~MMonHealth() override { }
+  ~MMonHealth() final { }
 
 public:
   std::string_view get_type_name() const override { return "mon_health"; }
-  void print(ostream &o) const override {
+  void print(std::ostream &o) const override {
     o << "mon_health("
       << " e " << get_epoch()
       << " r " << get_round()
@@ -43,6 +43,7 @@ public:
   }
 
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     service_decode(p);
     decode(service_type, p);