From e2bdaa0ccb93d74630759b3a95e9fe6afc643a98 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 28 Mar 2019 20:47:26 -0400 Subject: [PATCH] messages: Update MOSDOpRepOp.h to work without using namespace Signed-off-by: Adam C. Emerson --- src/messages/MOSDRepOp.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/messages/MOSDRepOp.h b/src/messages/MOSDRepOp.h index 9d087f391e635..94fca67b0041b 100644 --- a/src/messages/MOSDRepOp.h +++ b/src/messages/MOSDRepOp.h @@ -37,7 +37,7 @@ public: spg_t pgid; - bufferlist::const_iterator p; + ceph::buffer::list::const_iterator p; // Decoding flags. Decoding is only needed for messages caught by pipe reader. bool final_decode_needed; @@ -48,7 +48,7 @@ public: __u8 acks_wanted; // transaction to exec - bufferlist logbl; + ceph::buffer::list logbl; pg_stat_t pg_stats; // subop metadata @@ -80,6 +80,7 @@ public: } void decode_payload() override { + using ceph::decode; p = payload.cbegin(); // split to partial and final decode(map_epoch, p); @@ -94,6 +95,7 @@ public: } void finish_decode() { + using ceph::decode; if (!final_decode_needed) return; // Message is already final decoded decode(poid, p); @@ -164,7 +166,7 @@ private: public: std::string_view get_type_name() const override { return "osd_repop"; } - void print(ostream& out) const override { + void print(std::ostream& out) const override { out << "osd_repop(" << reqid << " " << pgid << " e" << map_epoch << "/" << min_epoch; if (!final_decode_needed) { -- 2.39.5