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

messages: Update MCommandReply.h to work without using namespace

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

diff --git a/src/messages/MCommandReply.h b/src/messages/MCommandReply.h
index d740565b0afc..09a6017d1951 100644
--- a/src/messages/MCommandReply.h
+++ b/src/messages/MCommandReply.h
@@ -25,7 +25,7 @@ public:
   friend factory;
 
   errorcode32_t r;
-  string rs;
+  std::string rs;
   
   MCommandReply()
     : MessageInstance(MSG_COMMAND_REPLY) {}
@@ -41,7 +41,7 @@ private:
 
 public:
   std::string_view get_type_name() const override { return "command_reply"; }
-  void print(ostream& o) const override {
+  void print(std::ostream& o) const override {
     o << "command_reply(tid " << get_tid() << ": " << r << " " << rs << ")";
   }
   
@@ -51,6 +51,7 @@ public:
     encode(rs, payload);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(r, p);
     decode(rs, p);