import 15.2.0 Octopus source

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

diff --git a/ceph/src/messages/MServiceMap.h b/ceph/src/messages/MServiceMap.h
index 275acfcd34206d1eb9ad46884b599461abc1e00b..45d50b67b699a25631bb9628fcfe73ee15a8082c 100644 (file)
--- a/ceph/src/messages/MServiceMap.h
+++ b/ceph/src/messages/MServiceMap.h
@@ -6,15 +6,13 @@
 #include "msg/Message.h"
 #include "mgr/ServiceMap.h"
 
-class MServiceMap : public MessageInstance<MServiceMap> {
+class MServiceMap : public Message {
 public:
-  friend factory;
-
   ServiceMap service_map;
 
-  MServiceMap() : MessageInstance(MSG_SERVICE_MAP) { }
+  MServiceMap() : Message{MSG_SERVICE_MAP} { }
   explicit MServiceMap(const ServiceMap& sm)
-    : MessageInstance(MSG_SERVICE_MAP),
+    : Message{MSG_SERVICE_MAP},
       service_map(sm) {
   }
 private:
@@ -34,4 +32,7 @@ public:
     auto p = payload.cbegin();
     decode(service_map, p);
   }
+private:
+  template<class T, typename... Args>
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };