update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/messages/MMonSubscribeAck.h b/ceph/src/messages/MMonSubscribeAck.h
index 0e46bbfb32f564c42aaf613f4bf2536f059ea064..087e5069db3c7204b321a2458545009f4567ef6f 100644 (file)
--- a/ceph/src/messages/MMonSubscribeAck.h
+++ b/ceph/src/messages/MMonSubscribeAck.h
@@ -17,32 +17,36 @@
 
 #include "msg/Message.h"
 
-struct MMonSubscribeAck : public Message {
+class MMonSubscribeAck : public MessageInstance<MMonSubscribeAck> {
+public:
+  friend factory;
+
   __u32 interval;
   uuid_d fsid;
   
-  MMonSubscribeAck() : Message(CEPH_MSG_MON_SUBSCRIBE_ACK),
+  MMonSubscribeAck() : MessageInstance(CEPH_MSG_MON_SUBSCRIBE_ACK),
                       interval(0) {
   }
-  MMonSubscribeAck(uuid_d& f, int i) : Message(CEPH_MSG_MON_SUBSCRIBE_ACK),
+  MMonSubscribeAck(uuid_d& f, int i) : MessageInstance(CEPH_MSG_MON_SUBSCRIBE_ACK),
                                       interval(i), fsid(f) { }
 private:
   ~MMonSubscribeAck() override {}
 
 public:
-  const char *get_type_name() const override { return "mon_subscribe_ack"; }
+  std::string_view get_type_name() const override { return "mon_subscribe_ack"; }
   void print(ostream& o) const override {
     o << "mon_subscribe_ack(" << interval << "s)";
   }
 
   void decode_payload() override {
-    bufferlist::iterator p = payload.begin();
-    ::decode(interval, p);
-    ::decode(fsid, p);
+    auto p = payload.cbegin();
+    decode(interval, p);
+    decode(fsid, p);
   }
   void encode_payload(uint64_t features) override {
-    ::encode(interval, payload);
-    ::encode(fsid, payload);
+    using ceph::encode;
+    encode(interval, payload);
+    encode(fsid, payload);
   }
 };