From b0eeb108d22b9a2ab50a94eaadda470cd4b565c6 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 28 Mar 2019 20:51:13 -0400 Subject: [PATCH] messages: Update MMonCommandAck.h to work without using namespace Signed-off-by: Adam C. Emerson --- src/messages/MMonCommandAck.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/messages/MMonCommandAck.h b/src/messages/MMonCommandAck.h index cc7a15fce5f71..9ea4035583e93 100644 --- a/src/messages/MMonCommandAck.h +++ b/src/messages/MMonCommandAck.h @@ -21,12 +21,12 @@ class MMonCommandAck : public MessageInstance cmd; + std::vector cmd; errorcode32_t r; - string rs; - + std::string rs; + MMonCommandAck() : MessageInstance(MSG_MON_COMMAND_ACK, 0) {} - MMonCommandAck(vector& c, int _r, string s, version_t v) : + MMonCommandAck(std::vector& c, int _r, std::string s, version_t v) : MessageInstance(MSG_MON_COMMAND_ACK, v), cmd(c), r(_r), rs(s) { } private: @@ -34,7 +34,7 @@ private: public: std::string_view get_type_name() const override { return "mon_command"; } - void print(ostream& o) const override { + void print(std::ostream& o) const override { o << "mon_command_ack(" << cmd << "=" << r << " " << rs << " v" << version << ")"; } @@ -46,6 +46,7 @@ public: encode(cmd, payload); } void decode_payload() override { + using ceph::decode; auto p = payload.cbegin(); paxos_decode(p); decode(r, p); -- 2.39.5