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

messages: Update MOSDMap.h to work without using namespace

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

diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h
index 9a5062c64ce..3c2ef510a91 100644
--- a/src/messages/MOSDMap.h
+++ b/src/messages/MOSDMap.h
@@ -30,19 +30,19 @@ private:
  public:
   uuid_d fsid;
   uint64_t encode_features = 0;
-  map<epoch_t, bufferlist> maps;
-  map<epoch_t, bufferlist> incremental_maps;
+  std::map<epoch_t, ceph::buffer::list> maps;
+  std::map<epoch_t, ceph::buffer::list> incremental_maps;
   epoch_t oldest_map =0, newest_map = 0;
 
   // if we are fetching maps from the mon and have to jump a gap
-  // (client's next needed map is older than mon's oldest) we can
+  // (client's next needed std::map is older than mon's oldest) we can
   // share removed snaps from the gap here.
   mempool::osdmap::map<int64_t,OSDMap::snap_interval_set_t> gap_removed_snaps;
 
   epoch_t get_first() const {
     epoch_t e = 0;
-    map<epoch_t, bufferlist>::const_iterator i = maps.begin();
-    if (i != maps.end())  e = i->first;
+    auto i = maps.cbegin();
+    if (i != maps.cend())  e = i->first;
     i = incremental_maps.begin();    
     if (i != incremental_maps.end() &&
         (e == 0 || i->first < e)) e = i->first;
@@ -50,8 +50,8 @@ private:
   }
   epoch_t get_last() const {
     epoch_t e = 0;
-    map<epoch_t, bufferlist>::const_reverse_iterator i = maps.rbegin();
-    if (i != maps.rend())  e = i->first;
+    auto i = maps.crbegin();
+    if (i != maps.crend())  e = i->first;
     i = incremental_maps.rbegin();    
     if (i != incremental_maps.rend() &&
         (e == 0 || i->first > e)) e = i->first;
@@ -75,6 +75,7 @@ private:
 public:
   // marshalling
   void decode_payload() override {
+    using ceph::decode;
     auto p = payload.cbegin();
     decode(fsid, p);
     decode(incremental_maps, p);
@@ -111,9 +112,7 @@ public:
       // FIXME: this can probably be done more efficiently higher up
       // the stack, or maybe replaced with something that only
       // includes the pools the client cares about.
-      for (map<epoch_t,bufferlist>::iterator p = incremental_maps.begin();
-	   p != incremental_maps.end();
-	   ++p) {
+      for (auto p = incremental_maps.begin(); p != incremental_maps.end(); ++p) {
 	OSDMap::Incremental inc;
 	auto q = p->second.cbegin();
 	inc.decode(q);
@@ -121,14 +120,14 @@ public:
 	uint64_t f = inc.encode_features & features;
 	p->second.clear();
 	if (inc.fullmap.length()) {
-	  // embedded full map?
+	  // embedded full std::map?
 	  OSDMap m;
 	  m.decode(inc.fullmap);
 	  inc.fullmap.clear();
 	  m.encode(inc.fullmap, f | CEPH_FEATURE_RESERVED);
 	}
 	if (inc.crush.length()) {
-	  // embedded crush map
+	  // embedded crush std::map
 	  CrushWrapper c;
 	  auto p = inc.crush.cbegin();
 	  c.decode(p);
@@ -137,9 +136,7 @@ public:
 	}
 	inc.encode(p->second, f | CEPH_FEATURE_RESERVED);
       }
-      for (map<epoch_t,bufferlist>::iterator p = maps.begin();
-	   p != maps.end();
-	   ++p) {
+      for (auto p = maps.begin(); p != maps.end(); ++p) {
 	OSDMap m;
 	m.decode(p->second);
 	// always encode with subset of osdmaps canonical features
@@ -160,7 +157,7 @@ public:
   }
 
   std::string_view get_type_name() const override { return "osdmap"; }
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "osd_map(" << get_first() << ".." << get_last();
     if (oldest_map || newest_map)
       out << " src has " << oldest_map << ".." << newest_map;