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

messages: Update MOSDPGLog.h to work without using namespace

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

diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h
index a9a7d2446bd..e391183a268 100644
--- a/src/messages/MOSDPGLog.h
+++ b/src/messages/MOSDPGLog.h
@@ -85,7 +85,7 @@ private:
 
 public:
   std::string_view get_type_name() const override { return "PGlog"; }
-  void inner_print(ostream& out) const override {
+  void inner_print(std::ostream& out) const override {
     // NOTE: log is not const, but operator<< doesn't touch fields
     // swapped out by OSD code.
     out << "log " << log
@@ -109,6 +109,7 @@ public:
     encode(from, payload);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(epoch, p);
     decode(info, p);