summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam C. Emerson <aemerson@redhat.com>2022-01-21 19:57:34 -0500
committerAdam C. Emerson <aemerson@redhat.com>2022-01-21 22:28:35 -0500
commit0878150f8b89e53a55f6cd61dd5a1c4c7c5114d7 (patch)
tree4f081f1690a54458c9addbb1e8e51d611f90f870
parentae07ccb15239383771cd7c95985b08ca459ba05b (diff)
downloadceph-0878150f8b89e53a55f6cd61dd5a1c4c7c5114d7.tar.gz
mgr: Remove straggling `using namespace std` from headers
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
-rw-r--r--src/mgr/ActivePyModules.h4
-rw-r--r--src/mgr/TTLCache.h4
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mgr/ActivePyModules.h b/src/mgr/ActivePyModules.h
index 2547c256538..0469c4755e9 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 a6d5ddf2e2d..d29b787bbf6 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++;