update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/messages/MServiceMap.h b/ceph/src/messages/MServiceMap.h
index 45d50b67b699a25631bb9628fcfe73ee15a8082c..05954354a882bd43930b79152caf14ddc6bd49f7 100644 (file)
--- a/ceph/src/messages/MServiceMap.h
+++ b/ceph/src/messages/MServiceMap.h
@@ -6,7 +6,7 @@
 #include "msg/Message.h"
 #include "mgr/ServiceMap.h"
 
-class MServiceMap : public Message {
+class MServiceMap final : public Message {
 public:
   ServiceMap service_map;
 
@@ -16,11 +16,11 @@ public:
       service_map(sm) {
   }
 private:
-  ~MServiceMap() override {}
+  ~MServiceMap() final {}
 
 public:
   std::string_view get_type_name() const override { return "service_map"; }
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "service_map(e" << service_map.epoch << " "
        << service_map.services.size() << " svc)";
   }
@@ -29,6 +29,7 @@ public:
     encode(service_map, payload, features);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(service_map, p);
   }