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

messages: Update MOSDRepOpReply.h to work without using namespace

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

diff --git a/src/messages/MOSDRepOpReply.h b/src/messages/MOSDRepOpReply.h
index 9ca3a54f5872..3265dcb10f3a 100644
--- a/src/messages/MOSDRepOpReply.h
+++ b/src/messages/MOSDRepOpReply.h
@@ -47,7 +47,7 @@ public:
   // piggybacked osd state
   eversion_t last_complete_ondisk;
 
-  bufferlist::const_iterator p;
+  ceph::buffer::list::const_iterator p;
   // Decoding flags. Decoding is only needed for messages caught by pipe reader.
   bool final_decode_needed;
 
@@ -62,6 +62,7 @@ public:
   }
 
   void decode_payload() override {
+    using ceph::decode;
     p = payload.cbegin();
     decode(map_epoch, p);
     if (header.version >= 2) {
@@ -75,6 +76,7 @@ public:
   }
 
   void finish_decode() {
+    using ceph::decode;
     if (!final_decode_needed)
       return; // Message is already final decoded
     decode(ack_type, p);
@@ -140,7 +142,7 @@ private:
 public:
   std::string_view get_type_name() const override { return "osd_repop_reply"; }
 
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "osd_repop_reply(" << reqid
         << " " << pgid << " e" << map_epoch << "/" << min_epoch;
     if (!final_decode_needed) {