From b8053220a92e25bb94656b8489df608dff53c7f5 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 28 Mar 2019 20:51:38 -0400 Subject: [PATCH] messages: Update MMgrReport.h to work without using namespace Signed-off-by: Adam C. Emerson --- src/messages/MMgrReport.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/messages/MMgrReport.h b/src/messages/MMgrReport.h index dcfbf658546ab..b203c449ed26d 100644 --- a/src/messages/MMgrReport.h +++ b/src/messages/MMgrReport.h @@ -37,7 +37,7 @@ public: uint8_t priority = PerfCountersBuilder::PRIO_USEFUL; enum unit_t unit; - void encode(bufferlist &bl) const + void encode(ceph::buffer::list &bl) const { // TODO: decide whether to drop the per-type // encoding here, we could rely on the MgrReport @@ -53,7 +53,7 @@ public: ENCODE_FINISH(bl); } - void decode(bufferlist::const_iterator &p) + void decode(ceph::buffer::list::const_iterator &p) { DECODE_START(3, p); decode(path, p); @@ -93,8 +93,8 @@ public: // Decode: iterate over the types we know about, sorted by idx, // and use the current type's type to decide how to decode - // the next bytes from the bufferlist. - bufferlist packed; + // the next bytes from the ceph::buffer::list. + ceph::buffer::list packed; std::string daemon_name; std::string service_name; // optional; otherwise infer from entity type @@ -105,12 +105,13 @@ public: std::vector daemon_health_metrics; // encode map> of current config - bufferlist config_bl; + ceph::buffer::list config_bl; std::map osd_perf_metric_reports; void decode_payload() override { + using ceph::decode; auto p = payload.cbegin(); decode(daemon_name, p); decode(declare_types, p); @@ -146,7 +147,7 @@ public: } std::string_view get_type_name() const override { return "mgrreport"; } - void print(ostream& out) const override { + void print(std::ostream& out) const override { out << get_type_name() << "("; if (service_name.length()) { out << service_name; @@ -172,4 +173,3 @@ public: }; #endif - -- 2.39.5