From: Adam C. Emerson <aemerson@redhat.com>
Date: Sat, 22 Jan 2022 00:57:34 +0000 (-0500)
Subject: mgr: Remove straggling `using namespace std` from headers
X-Git-Tag: v18.0.0~1518^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0878150f8b89e53a55f6cd61dd5a1c4c7c5114d7;p=ceph.git

mgr: Remove straggling `using namespace std` from headers

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

diff --git a/src/mgr/ActivePyModules.h b/src/mgr/ActivePyModules.h
index 2547c2565386..0469c4755e9e 100644
--- a/src/mgr/ActivePyModules.h
+++ b/src/mgr/ActivePyModules.h
@@ -56,14 +56,14 @@ class ActivePyModules
   Objecter &objecter;
   Client   &client;
   Finisher &finisher;
-  TTLCache<string, PyObject*> ttl_cache;
+  TTLCache<std::string, PyObject*> ttl_cache;
 public:
   Finisher cmd_finisher;
 private:
   DaemonServer &server;
   PyModuleRegistry &py_module_registry;
 
-  map<std::string,ProgressEvent> progress_events;
+  std::map<std::string,ProgressEvent> progress_events;
 
   mutable ceph::mutex lock = ceph::make_mutex("ActivePyModules::lock");
 
diff --git a/src/mgr/TTLCache.h b/src/mgr/TTLCache.h
index a6d5ddf2e2d0..d29b787bbf69 100644
--- a/src/mgr/TTLCache.h
+++ b/src/mgr/TTLCache.h
@@ -10,8 +10,6 @@
 
 #include "PyUtil.h"
 
-using namespace std;
-
 template <class Key, class Value> class Cache {
  private:
   std::atomic<uint64_t> hits, misses;
@@ -20,7 +18,7 @@ template <class Key, class Value> class Cache {
   unsigned int capacity;
   Cache(unsigned int size = UINT16_MAX) : hits{0}, misses{0}, capacity{size} {};
   std::map<Key, Value> content;
-  std::vector<string> allowed_keys = {"osd_map", "pg_dump", "pg_stats"};
+  std::vector<std::string> allowed_keys = {"osd_map", "pg_dump", "pg_stats"};
 
   void mark_miss() {
     misses++;