update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/messages/MCommand.h b/ceph/src/messages/MCommand.h
index d6f59fe4c08229d59566da6ddfecc3e80c59a1b0..421d04c2c56d174eaa51fa5f7aef2c0747bfc9a0 100644 (file)
--- a/ceph/src/messages/MCommand.h
+++ b/ceph/src/messages/MCommand.h
@@ -19,22 +19,24 @@
 
 #include "msg/Message.h"
 
-class MCommand : public Message {
- public:
+class MCommand : public MessageInstance<MCommand> {
+public:
+  friend factory;
+
   uuid_d fsid;
   std::vector<string> cmd;
 
   MCommand()
-    : Message(MSG_COMMAND) {}
+    : MessageInstance(MSG_COMMAND) {}
   MCommand(const uuid_d &f)
-    : Message(MSG_COMMAND),
+    : MessageInstance(MSG_COMMAND),
       fsid(f) { }
 
 private:
   ~MCommand() override {}
 
 public:  
-  const char *get_type_name() const override { return "command"; }
+  std::string_view get_type_name() const override { return "command"; }
   void print(ostream& o) const override {
     o << "command(tid " << get_tid() << ": ";
     for (unsigned i=0; i<cmd.size(); i++) {
@@ -45,13 +47,14 @@ public:
   }
   
   void encode_payload(uint64_t features) override {
-    ::encode(fsid, payload);
-    ::encode(cmd, payload);
+    using ceph::encode;
+    encode(fsid, payload);
+    encode(cmd, payload);
   }
   void decode_payload() override {
-    bufferlist::iterator p = payload.begin();
-    ::decode(fsid, p);
-    ::decode(cmd, p);
+    auto p = payload.cbegin();
+    decode(fsid, p);
+    decode(cmd, p);
   }
 };