From: Kefu Chai <kchai@redhat.com>
Date: Thu, 10 Dec 2020 09:10:21 +0000 (+0800)
Subject: mon: add "std::" to qualify type names
X-Git-Tag: v16.1.0~203^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a0c2dbe2a6c7bfcbc1e187d1da6bc8b7c70a397;p=ceph.git

mon: add "std::" to qualify type names

we should not assume that "using namespace std", or "using std::string"
in the included header files.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h
index 56723961b95..46c8c2df27f 100644
--- a/src/mon/MDSMonitor.h
+++ b/src/mon/MDSMonitor.h
@@ -125,11 +125,12 @@ class MDSMonitor : public PaxosService, public PaxosFSMap, protected CommandHand
   void remove_from_metadata(const FSMap &fsmap, MonitorDBStore::TransactionRef t);
   int load_metadata(std::map<mds_gid_t, Metadata>& m);
   void count_metadata(const std::string& field, ceph::Formatter *f);
+
 public:
   void count_metadata(const std::string& field, std::map<std::string,int> *out);
-  void get_versions(std::map<string, list<string> > &versions);
-protected:
+  void get_versions(std::map<std::string, std::list<std::string>> &versions);
 
+protected:
   // MDS daemon GID to latest health state from that GID
   std::map<uint64_t, MDSHealth> pending_daemon_health;
   std::set<uint64_t> pending_daemon_health_rm;
diff --git a/src/mon/MgrMonitor.h b/src/mon/MgrMonitor.h
index 5df70fc3634..be75602abf9 100644
--- a/src/mon/MgrMonitor.h
+++ b/src/mon/MgrMonitor.h
@@ -129,7 +129,7 @@ public:
   void print_nodes(ceph::Formatter *f) const;
   void count_metadata(const std::string& field, ceph::Formatter *f);
   void count_metadata(const std::string& field, std::map<std::string,int> *out);
-  void get_versions(std::map<string, list<string> > &versions);
+  void get_versions(std::map<std::string, std::list<std::string>> &versions);
 
   // When did the mon last call into our tick() method?  Used for detecting
   // when the mon was not updating us for some period (e.g. during slow
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 01e78da381c..4ce0b3850bb 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -966,8 +966,8 @@ private:
   void count_metadata(const std::string& field, ceph::Formatter *f);
   void count_metadata(const std::string& field, std::map<std::string,int> *out);
   // get_all_versions() gathers version information from daemons for health check
-  void get_all_versions(std::map<string, list<string> > &versions);
-  void get_versions(std::map<string, list<string> > &versions);
+  void get_all_versions(std::map<string, std::list<std::string>> &versions);
+  void get_versions(std::map<string, std::list<std::string>> &versions);
 
   // features
   static CompatSet get_initial_supported_features();
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 9e3b26d46ee..7bf4333e1b0 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2140,7 +2140,7 @@ void OSDMonitor::count_metadata(const string& field, Formatter *f)
   f->close_section();
 }
 
-void OSDMonitor::get_versions(std::map<string, list<string> > &versions)
+void OSDMonitor::get_versions(std::map<string, list<string>> &versions)
 {
   for (int osd = 0; osd < osdmap.get_max_osd(); ++osd) {
     if (osdmap.is_up(osd)) {
diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index ea04eb83350..255902169d9 100644
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -634,7 +634,7 @@ private:
   void reencode_full_map(ceph::buffer::list& bl, uint64_t features);
 public:
   void count_metadata(const std::string& field, std::map<std::string,int> *out);
-  void get_versions(std::map<string, list<string> > &versions);
+  void get_versions(std::map<std::string, std::list<std::string>> &versions);
 protected:
   int get_osd_objectstore_type(int osd, std::string *type);
   bool is_pool_currently_all_bluestore(int64_t pool_id, const pg_pool_t &pool,