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

messages: Update MPGStats.h to work without using namespace

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

diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h
index 4bf7afda5c5..dc4bd0a9c71 100644
--- a/src/messages/MPGStats.h
+++ b/src/messages/MPGStats.h
@@ -25,11 +25,11 @@ public:
   friend factory;
 
   uuid_d fsid;
-  map<pg_t, pg_stat_t> pg_stat;
+  std::map<pg_t, pg_stat_t> pg_stat;
   osd_stat_t osd_stat;
-  map<int64_t, store_statfs_t> pool_stat;
+  std::map<int64_t, store_statfs_t> pool_stat;
   epoch_t epoch = 0;
-  
+
   MPGStats() : MessageInstance(MSG_PGSTATS, 0, HEAD_VERSION, COMPAT_VERSION) {}
   MPGStats(const uuid_d& f, epoch_t e)
     : MessageInstance(MSG_PGSTATS, 0, HEAD_VERSION, COMPAT_VERSION),
@@ -42,7 +42,7 @@ private:
 
 public:
   std::string_view get_type_name() const override { return "pg_stats"; }
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "pg_stats(" << pg_stat.size() << " pgs tid " << get_tid() << " v " << version << ")";
   }
 
@@ -57,6 +57,7 @@ public:
     encode(pool_stat, payload, features);
   }
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     paxos_decode(p);
     decode(fsid, p);