update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/messages/MGenericMessage.h b/ceph/src/messages/MGenericMessage.h
index d84209e36b4fae73a81ea73c3c01fa46dd6e8ad8..49e906d6f0f58475e2381f652c09160d896472b6 100644 (file)
--- a/ceph/src/messages/MGenericMessage.h
+++ b/ceph/src/messages/MGenericMessage.h
@@ -18,19 +18,22 @@
 
 #include "msg/Message.h"
 
-class MGenericMessage : public Message {
+class MGenericMessage : public MessageInstance<MGenericMessage> {
+public:
+  friend factory;
+private:
   char tname[20];
   //long pcid;
 
  public:
-  MGenericMessage(int t=0) : Message(t) { 
+  MGenericMessage(int t=0) : MessageInstance(t) { 
     snprintf(tname, sizeof(tname), "generic%d", get_type());
   }
 
   //void set_pcid(long pcid) { this->pcid = pcid; }
   //long get_pcid() { return pcid; }
 
-  const char *get_type_name() const override { return tname; }
+  std::string_view get_type_name() const override { return tname; }
 
   void decode_payload() override { }
   void encode_payload(uint64_t features) override { }