update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/messages/MMonCommand.h b/ceph/src/messages/MMonCommand.h
index c6764475dcd0caa4a611878ff7883ae0f11daab9..afb3142b49dab933dd788284eda653f01ea66b8a 100644 (file)
--- a/ceph/src/messages/MMonCommand.h
+++ b/ceph/src/messages/MMonCommand.h
@@ -18,16 +18,18 @@
 #include "messages/PaxosServiceMessage.h"
 
 #include <vector>
-using std::vector;
+#include <string>
+
+class MMonCommand : public MessageInstance<MMonCommand, PaxosServiceMessage> {
+public:
+  friend factory;
 
-class MMonCommand : public PaxosServiceMessage {
- public:
   uuid_d fsid;
-  vector<string> cmd;
+  std::vector<std::string> cmd;
 
-  MMonCommand() : PaxosServiceMessage(MSG_MON_COMMAND, 0) {}
+  MMonCommand() : MessageInstance(MSG_MON_COMMAND, 0) {}
   MMonCommand(const uuid_d &f)
-    : PaxosServiceMessage(MSG_MON_COMMAND, 0),
+    : MessageInstance(MSG_MON_COMMAND, 0),
       fsid(f)
   { }
 
@@ -35,7 +37,7 @@ private:
   ~MMonCommand() override {}
 
 public:  
-  const char *get_type_name() const override { return "mon_command"; }
+  std::string_view get_type_name() const override { return "mon_command"; }
   void print(ostream& o) const override {
     o << "mon_command(";
     for (unsigned i=0; i<cmd.size(); i++) {
@@ -46,15 +48,16 @@ public:
   }
   
   void encode_payload(uint64_t features) override {
+    using ceph::encode;
     paxos_encode();
-    ::encode(fsid, payload);
-    ::encode(cmd, payload);
+    encode(fsid, payload);
+    encode(cmd, payload);
   }
   void decode_payload() override {
-    bufferlist::iterator p = payload.begin();
+    auto p = payload.cbegin();
     paxos_decode(p);
-    ::decode(fsid, p);
-    ::decode(cmd, p);
+    decode(fsid, p);
+    decode(cmd, p);
   }
 };