import 15.2.0 Octopus source

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

diff --git a/ceph/src/messages/MMDSTableRequest.h b/ceph/src/messages/MMDSTableRequest.h
index 4a6e2ca97e48e0b9e2d1633e66f2da109fb9ff03..01254d0bbb021a1553325e273400363a13235ed7 100644 (file)
--- a/ceph/src/messages/MMDSTableRequest.h
+++ b/ceph/src/messages/MMDSTableRequest.h
@@ -19,19 +19,17 @@
 #include "msg/Message.h"
 #include "mds/mds_table_types.h"
 
-class MMDSTableRequest : public MessageInstance<MMDSTableRequest> {
+class MMDSTableRequest : public SafeMessage {
 public:
-  friend factory;
-
   __u16 table = 0;
   __s16 op = 0;
   uint64_t reqid = 0;
   bufferlist bl;
 
 protected:
-  MMDSTableRequest() : MessageInstance(MSG_MDS_TABLE_REQUEST) {}
+  MMDSTableRequest() : SafeMessage{MSG_MDS_TABLE_REQUEST} {}
   MMDSTableRequest(int tab, int o, uint64_t r, version_t v=0) : 
-    MessageInstance(MSG_MDS_TABLE_REQUEST),
+    SafeMessage{MSG_MDS_TABLE_REQUEST},
     table(tab), op(o), reqid(r) {
     set_tid(v);
   }
@@ -63,6 +61,9 @@ public:
     encode(reqid, payload);
     encode(bl, payload);
   }
+private:
+  template<class T, typename... Args>
+  friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
 };
 
 #endif