update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MOSDPGNotify.h b/ceph/src/messages/MOSDPGNotify.h
index 9f25fa24241024bf1714d9a52aab0ac282a727e8..a3b237c1a8b05b6b46c767cd6f160d88b9da7fc0 100644 (file)
--- a/ceph/src/messages/MOSDPGNotify.h
+++ b/ceph/src/messages/MOSDPGNotify.h
@@ -23,7 +23,7 @@
  * PGNotify - notify primary of my PGs and versions.
  */
 
-class MOSDPGNotify : public Message {
+class MOSDPGNotify final : public Message {
 private:
   static constexpr int HEAD_VERSION = 7;
   static constexpr int COMPAT_VERSION = 6;
@@ -52,7 +52,7 @@ private:
     set_priority(CEPH_MSG_PRIO_HIGH);
   }
 private:
-  ~MOSDPGNotify() override {}
+  ~MOSDPGNotify() final {}
 
 public:  
   std::string_view get_type_name() const override { return "PGnot"; }
@@ -76,6 +76,7 @@ public:
 
   void decode_payload() override {
     auto p = payload.cbegin();
+    using ceph::decode;
     decode(epoch, p);
     if (header.version == 6) {
       // decode legacy vector<pair<pg_notify_t,PastIntervals>>
@@ -90,7 +91,7 @@ public:
     }
     decode(pg_list, p);
   }
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "pg_notify(";
     for (auto i = pg_list.begin();
          i != pg_list.end();