import 15.2.0 Octopus source

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

diff --git a/ceph/src/messages/MMonHealthChecks.h b/ceph/src/messages/MMonHealthChecks.h
index e9e611b1d4f45d07e55a5343d45870cf7be1bfc3..86a4fa0c9208651cc207489e55c1896f1a91d87a 100644 (file)
--- a/ceph/src/messages/MMonHealthChecks.h
+++ b/ceph/src/messages/MMonHealthChecks.h
@@ -7,22 +7,20 @@
 #include "messages/PaxosServiceMessage.h"
 #include "mon/health_check.h"
 
-class MMonHealthChecks : public MessageInstance<MMonHealthChecks, PaxosServiceMessage> {
+class MMonHealthChecks : public PaxosServiceMessage {
 public:
-  friend factory;
-
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 
   health_check_map_t health_checks;
 
   MMonHealthChecks()
-    : MessageInstance(MSG_MON_HEALTH_CHECKS, HEAD_VERSION, COMPAT_VERSION) {
+    : PaxosServiceMessage{MSG_MON_HEALTH_CHECKS, HEAD_VERSION, COMPAT_VERSION} {
   }
   MMonHealthChecks(health_check_map_t& m)
-    : MessageInstance(MSG_MON_HEALTH_CHECKS, HEAD_VERSION, COMPAT_VERSION),
-      health_checks(m) {
-  }
+    : PaxosServiceMessage{MSG_MON_HEALTH_CHECKS, HEAD_VERSION, COMPAT_VERSION},
+      health_checks(m)
+  {}
 
 private:
   ~MMonHealthChecks() override { }
@@ -44,7 +42,9 @@ public:
     paxos_encode();
     encode(health_checks, payload);
   }
-
+private:
+  template<class T, typename... Args>
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };
 
 #endif