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 56723961b95d766005fb83c0c9fdce96b345d2b0..46c8c2df27f4b92d707860923551b2dfc1edd21b 100644 (file)
--- 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 5df70fc363403f8bd50e62f013fb23cfa2607cbd..be75602abf9fabf008f4876ee0abbb15d386f203 100644 (file)
--- 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 01e78da381ca7a690335ee4d4136c8021e9ec81b..4ce0b3850bbd379d1e0746838d87fcd0eb5f3342 100644 (file)
--- 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 9e3b26d46ee43f713432d67efe9561207f19b16b..7bf4333e1b056c8bc89ebf90386eab12fcc368d6 100644 (file)
--- 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 ea04eb83350a2dcf921c325d07def00fef8a5261..255902169d9bd8fe42dd2c92ed18552c123918f4 100644 (file)
--- 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,