From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 29 Mar 2019 00:51:23 +0000 (-0400)
Subject: messages: Update MMonCommand.h to work without using namespace
X-Git-Tag: v15.0.0~19^2~76
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7cecfaf533d7c9a7c223f55b349547e0afab3f85;p=ceph-ci.git

messages: Update MMonCommand.h to work without using namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/messages/MMonCommand.h b/src/messages/MMonCommand.h
index afb3142b49d..e652f24a32f 100644
--- a/src/messages/MMonCommand.h
+++ b/src/messages/MMonCommand.h
@@ -36,9 +36,9 @@ public:
 private:
   ~MMonCommand() override {}
 
-public:  
+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(";
     for (unsigned i=0; i<cmd.size(); i++) {
       if (i) o << ' ';
@@ -46,7 +46,7 @@ public:
     }
     o << " v " << version << ")";
   }
-  
+
   void encode_payload(uint64_t features) override {
     using ceph::encode;
     paxos_encode();
@@ -54,6 +54,7 @@ public:
     encode(cmd, payload);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     paxos_decode(p);
     decode(fsid, p);