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

osd: Update OSDMapMapping to work without using namespace

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

diff --git a/src/osd/OSDMapMapping.cc b/src/osd/OSDMapMapping.cc
index 6640d83dd8ac..d92625f4f277 100644
--- a/src/osd/OSDMapMapping.cc
+++ b/src/osd/OSDMapMapping.cc
@@ -93,11 +93,11 @@ void OSDMapMapping::_finish(const OSDMap& osdmap)
 void OSDMapMapping::_dump()
 {
   for (auto& p : pools) {
-    cout << "pool " << p.first << std::endl;
+    std::cout << "pool " << p.first << std::endl;
     for (unsigned i = 0; i < p.second.table.size(); ++i) {
-      cout << " " << p.second.table[i];
+      std::cout << " " << p.second.table[i];
       if (i % p.second.row_size() == p.second.row_size() - 1)
-	cout << std::endl;
+	std::cout << std::endl;
     }
   }
 }
@@ -113,7 +113,7 @@ void OSDMapMapping::_update_range(
   ceph_assert(pg_begin <= pg_end);
   ceph_assert(pg_end <= i->second.pg_num);
   for (unsigned ps = pg_begin; ps < pg_end; ++ps) {
-    vector<int> up, acting;
+    std::vector<int> up, acting;
     int up_primary, acting_primary;
     osdmap.pg_to_up_acting_osds(
       pg_t(ps, pool),
diff --git a/src/osd/OSDMapMapping.h b/src/osd/OSDMapMapping.h
index 9ceef9ff0664..965797db7ad0 100644
--- a/src/osd/OSDMapMapping.h
+++ b/src/osd/OSDMapMapping.h
@@ -301,7 +301,7 @@ public:
     auto p = pools.find(pgid.pool());
     ceph_assert(p != pools.end());
     ceph_assert(pgid.ps() < p->second.pg_num);
-    vector<int> acting;
+    std::vector<int> acting;
     p->second.get(pgid.ps(), nullptr, nullptr, &acting, acting_primary);
     if (p->second.erasure) {
       for (uint8_t i = 0; i < acting.size(); ++i) {