import 15.2.0 Octopus source

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

diff --git a/ceph/src/messages/MMonGlobalID.h b/ceph/src/messages/MMonGlobalID.h
index 79535a6b7d84618dca79414d1e8400fd65cf58eb..dde000e7947997486735d195b4308d98670d0b98 100644 (file)
--- a/ceph/src/messages/MMonGlobalID.h
+++ b/ceph/src/messages/MMonGlobalID.h
@@ -17,12 +17,11 @@
 
 #include "messages/PaxosServiceMessage.h"
 
-class MMonGlobalID : public MessageInstance<MMonGlobalID, PaxosServiceMessage> {
+class MMonGlobalID : public PaxosServiceMessage {
 public:
-  friend factory;
-
-  uint64_t old_max_id;
-  MMonGlobalID() : MessageInstance(MSG_MON_GLOBAL_ID, 0), old_max_id(0) { }
+  uint64_t old_max_id = 0;
+  MMonGlobalID() : PaxosServiceMessage{MSG_MON_GLOBAL_ID, 0}
+  {}
 private:
   ~MMonGlobalID() override {}
 
@@ -42,6 +41,9 @@ public:
     paxos_encode();
     encode(old_max_id, payload);
   }
+private:
+  template<class T, typename... Args>
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };
 
 #endif