import 15.2.0 Octopus source

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

diff --git a/ceph/src/messages/MClientReclaim.h b/ceph/src/messages/MClientReclaim.h
index ffb7609c31b6e78e463b60feaea39bb5202fba3c..03bad8d6401dc4f870b76af25f483abba89c2542 100644 (file)
--- a/ceph/src/messages/MClientReclaim.h
+++ b/ceph/src/messages/MClientReclaim.h
@@ -18,7 +18,7 @@
 
 #include "msg/Message.h"
 
-class MClientReclaim: public MessageInstance<MClientReclaim> {
+class MClientReclaim: public SafeMessage {
 public:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
@@ -48,17 +48,19 @@ public:
   }
 
 protected:
-  friend factory;
   MClientReclaim() :
-    MessageInstance(CEPH_MSG_CLIENT_RECLAIM, HEAD_VERSION, COMPAT_VERSION) {}
+    SafeMessage{CEPH_MSG_CLIENT_RECLAIM, HEAD_VERSION, COMPAT_VERSION} {}
   MClientReclaim(std::string_view _uuid, uint32_t _flags) :
-    MessageInstance(CEPH_MSG_CLIENT_RECLAIM, HEAD_VERSION, COMPAT_VERSION),
+    SafeMessage{CEPH_MSG_CLIENT_RECLAIM, HEAD_VERSION, COMPAT_VERSION},
     uuid(_uuid), flags(_flags) {}
 private:
   ~MClientReclaim() override {}
 
   std::string uuid;
   uint32_t flags = 0;
+
+  template<class T, typename... Args>
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };
 
 #endif