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

messages: Update MAuthReply.h to work without using namespace

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

diff --git a/src/messages/MAuthReply.h b/src/messages/MAuthReply.h
index be3368e65337..ec47ff2001c4 100644
--- a/src/messages/MAuthReply.h
+++ b/src/messages/MAuthReply.h
@@ -25,11 +25,11 @@ public:
   __u32 protocol;
   errorcode32_t result;
   uint64_t global_id;      // if zero, meaningless
-  string result_msg;
-  bufferlist result_bl;
+  std::string result_msg;
+  ceph::buffer::list result_bl;
 
   MAuthReply() : MessageInstance(CEPH_MSG_AUTH_REPLY), protocol(0), result(0), global_id(0) {}
-  MAuthReply(__u32 p, bufferlist *bl = NULL, int r = 0, uint64_t gid=0, const char *msg = "") :
+  MAuthReply(__u32 p, ceph::buffer::list *bl = NULL, int r = 0, uint64_t gid=0, const char *msg = "") :
     MessageInstance(CEPH_MSG_AUTH_REPLY),
     protocol(p), result(r), global_id(gid),
     result_msg(msg) {
@@ -41,7 +41,7 @@ private:
 
 public:
   std::string_view get_type_name() const override { return "auth_reply"; }
-  void print(ostream& o) const override {
+  void print(std::ostream& o) const override {
     o << "auth_reply(proto " << protocol << " " << result << " " << cpp_strerror(result);
     if (result_msg.length())
       o << ": " << result_msg;
@@ -49,6 +49,7 @@ public:
   }
 
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(protocol, p);
     decode(result, p);