import 15.2.0 Octopus source

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

diff --git a/ceph/src/messages/MOSDECSubOpReadReply.h b/ceph/src/messages/MOSDECSubOpReadReply.h
index 091e53910edfcd1199b8cf65d935c3d0d8e82967..fb5e80112271a0ea162d1f3a6c5ac1a9db088bc4 100644 (file)
--- a/ceph/src/messages/MOSDECSubOpReadReply.h
+++ b/ceph/src/messages/MOSDECSubOpReadReply.h
@@ -18,9 +18,7 @@
 #include "MOSDFastDispatchOp.h"
 #include "osd/ECMsgTypes.h"
 
-class MOSDECSubOpReadReply : public MessageInstance<MOSDECSubOpReadReply, MOSDFastDispatchOp> {
-public:
-  friend factory;
+class MOSDECSubOpReadReply : public MOSDFastDispatchOp {
 private:
   static constexpr int HEAD_VERSION = 2;
   static constexpr int COMPAT_VERSION = 1;
@@ -44,7 +42,7 @@ public:
   }
 
   MOSDECSubOpReadReply()
-    : MessageInstance(MSG_OSD_EC_READ_REPLY, HEAD_VERSION, COMPAT_VERSION)
+    : MOSDFastDispatchOp{MSG_OSD_EC_READ_REPLY, HEAD_VERSION, COMPAT_VERSION}
     {}
 
   void decode_payload() override {
@@ -77,6 +75,9 @@ public:
        << " " << op;
     out << ")";
   }
+private:
+  template<class T, typename... Args>
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };
 
 #endif