From 32fa05be53e6ffd28089ded49bb75830cb7b7539 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 28 Mar 2019 20:55:17 -0400 Subject: [PATCH] messages: Update MAuth.h to work without using namespace Signed-off-by: Adam C. Emerson --- src/messages/MAuth.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/messages/MAuth.h b/src/messages/MAuth.h index 0075e0b9fba..8fd28ff029e 100644 --- a/src/messages/MAuth.h +++ b/src/messages/MAuth.h @@ -15,6 +15,12 @@ #ifndef CEPH_MAUTH_H #define CEPH_MAUTH_H +#include + +#include "include/encoding.h" + +#include "msg/Message.h" +#include "msg/MessageRef.h" #include "messages/PaxosServiceMessage.h" class MAuth : public MessageInstance { @@ -22,7 +28,7 @@ public: friend factory; __u32 protocol; - bufferlist auth_payload; + ceph::buffer::list auth_payload; epoch_t monmap_epoch; /* if protocol == 0, then auth_payload is a set<__u32> listing protocols the client supports */ @@ -33,13 +39,13 @@ private: public: std::string_view get_type_name() const override { return "auth"; } - void print(ostream& out) const override { + void print(std::ostream& out) const override { out << "auth(proto " << protocol << " " << auth_payload.length() << " bytes" << " epoch " << monmap_epoch << ")"; } void decode_payload() override { - using ceph::encode; + using ceph::decode; auto p = payload.cbegin(); paxos_decode(p); decode(protocol, p); @@ -56,7 +62,7 @@ public: encode(auth_payload, payload); encode(monmap_epoch, payload); } - bufferlist& get_auth_payload() { return auth_payload; } + ceph::buffer::list& get_auth_payload() { return auth_payload; } }; #endif -- 2.39.5