From d47e5568aad32f4a9a343d45346982024058c1c6 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 28 Mar 2019 20:50:06 -0400 Subject: [PATCH] messages: Update MMonMap.h to work without using namespace Signed-off-by: Adam C. Emerson --- src/messages/MMonMap.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/messages/MMonMap.h b/src/messages/MMonMap.h index 57034b8ba41..5f0f5eba4e2 100644 --- a/src/messages/MMonMap.h +++ b/src/messages/MMonMap.h @@ -15,18 +15,20 @@ #ifndef CEPH_MMONMAP_H #define CEPH_MMONMAP_H +#include "include/encoding.h" #include "include/ceph_features.h" #include "msg/Message.h" +#include "msg/MessageRef.h" #include "mon/MonMap.h" class MMonMap : public MessageInstance { public: friend factory; - bufferlist monmapbl; + ceph::buffer::list monmapbl; MMonMap() : MessageInstance(CEPH_MSG_MON_MAP) { } - explicit MMonMap(bufferlist &bl) : MessageInstance(CEPH_MSG_MON_MAP) { + explicit MMonMap(ceph::buffer::list &bl) : MessageInstance(CEPH_MSG_MON_MAP) { monmapbl.claim(bl); } private: @@ -50,6 +52,7 @@ public: encode(monmapbl, payload); } void decode_payload() override { + using ceph::decode; auto p = payload.cbegin(); decode(monmapbl, p); } -- 2.39.5