import 15.2.0 Octopus source

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

diff --git a/ceph/src/messages/MOSDPeeringOp.h b/ceph/src/messages/MOSDPeeringOp.h
index 25487488a62f9b4ebecacc55ad93a7b118448505..56d10cff1362949be41870df67b105fda7e2feec 100644 (file)
--- a/ceph/src/messages/MOSDPeeringOp.h
+++ b/ceph/src/messages/MOSDPeeringOp.h
@@ -5,15 +5,15 @@
 
 #include "msg/Message.h"
 #include "osd/osd_types.h"
-#include "osd/PGPeeringEvent.h"
 
-class MOSDPeeringOp : public MessageSubType<MOSDPeeringOp> {
-public:
+class PGPeeringEvent;
 
-template<typename... Args>
-  MOSDPeeringOp(Args&&... args) : MessageSubType(std::forward<Args>(args)...) {}
+class MOSDPeeringOp : public Message {
+public:
+  MOSDPeeringOp(int t, int version, int compat_version)
+    : Message{t, version, compat_version} {}
 
-  void print(ostream& out) const override final {
+  void print(std::ostream& out) const override final {
     out << get_type_name() << "("
        << get_spg() << " ";
     inner_print(out);
@@ -24,5 +24,5 @@ template<typename... Args>
   virtual epoch_t get_map_epoch() const = 0;
   virtual epoch_t get_min_epoch() const = 0;
   virtual PGPeeringEvent *get_event() = 0;
-  virtual void inner_print(ostream& out) const = 0;
+  virtual void inner_print(std::ostream& out) const = 0;
 };