From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 29 Mar 2019 00:54:55 +0000 (-0400)
Subject: messages: Update MCommand.h to work without using namespace
X-Git-Tag: v15.0.0~19^2~64
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41b4b1c9ea5e3271ab597e33280fe3c788f76ad0;p=ceph.git

messages: Update MCommand.h to work without using namespace

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

diff --git a/src/messages/MCommand.h b/src/messages/MCommand.h
index 421d04c2c56d..ce8fde106ed8 100644
--- a/src/messages/MCommand.h
+++ b/src/messages/MCommand.h
@@ -24,7 +24,7 @@ public:
   friend factory;
 
   uuid_d fsid;
-  std::vector<string> cmd;
+  std::vector<std::string> cmd;
 
   MCommand()
     : MessageInstance(MSG_COMMAND) {}
@@ -35,9 +35,9 @@ public:
 private:
   ~MCommand() override {}
 
-public:  
+public:
   std::string_view get_type_name() const override { return "command"; }
-  void print(ostream& o) const override {
+  void print(std::ostream& o) const override {
     o << "command(tid " << get_tid() << ": ";
     for (unsigned i=0; i<cmd.size(); i++) {
       if (i) o << ' ';
@@ -52,6 +52,7 @@ public:
     encode(cmd, payload);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(fsid, p);
     decode(cmd, p);