From 72a287bac0d1c802fc0a8617ca8eee8b72ab3068 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 29 May 2019 17:31:40 -0700 Subject: [PATCH] PGPeeringEvent: move MLogRec constructor definition to .cc and add unique_ptr Signed-off-by: Samuel Just --- src/osd/PGPeeringEvent.cc | 3 +++ src/osd/PGPeeringEvent.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/osd/PGPeeringEvent.cc b/src/osd/PGPeeringEvent.cc index 52aff7dc209..79c21b826b9 100644 --- a/src/osd/PGPeeringEvent.cc +++ b/src/osd/PGPeeringEvent.cc @@ -6,3 +6,6 @@ #include "messages/MOSDPGLog.h" MEMPOOL_DEFINE_OBJECT_FACTORY(PGPeeringEvent, pg_peering_evt, osd); + +MLogRec::MLogRec(pg_shard_t from, MOSDPGLog *msg) : + from(from), msg(msg) {} diff --git a/src/osd/PGPeeringEvent.h b/src/osd/PGPeeringEvent.h index 21cc0b1a464..de32e97822a 100644 --- a/src/osd/PGPeeringEvent.h +++ b/src/osd/PGPeeringEvent.h @@ -67,6 +67,7 @@ public: } }; typedef std::shared_ptr PGPeeringEventRef; +typedef std::unique_ptr PGPeeringEventURef; struct MInfoRec : boost::statechart::event< MInfoRec > { pg_shard_t from; @@ -82,8 +83,7 @@ struct MInfoRec : boost::statechart::event< MInfoRec > { struct MLogRec : boost::statechart::event< MLogRec > { pg_shard_t from; boost::intrusive_ptr msg; - MLogRec(pg_shard_t from, MOSDPGLog *msg) : - from(from), msg(msg) {} + MLogRec(pg_shard_t from, MOSDPGLog *msg); void print(std::ostream *out) const { *out << "MLogRec from " << from; } -- 2.39.5