From 45eeca27deb27905d0d2a5137dab1117b66969f4 Mon Sep 17 00:00:00 2001
From: "Adam C. Emerson" <aemerson@redhat.com>
Date: Thu, 28 Mar 2019 20:40:59 -0400
Subject: [PATCH] mgr: Update ServiceMap to work without using namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---
 src/mgr/ServiceMap.cc |  3 +++
 src/mgr/ServiceMap.h  | 26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/mgr/ServiceMap.cc b/src/mgr/ServiceMap.cc
index ba7a43b24a8f4..42f2e00b79622 100644
--- a/src/mgr/ServiceMap.cc
+++ b/src/mgr/ServiceMap.cc
@@ -5,6 +5,9 @@
 
 #include "common/Formatter.h"
 
+using ceph::bufferlist;
+using ceph::Formatter;
+
 // Daemon
 
 void ServiceMap::Daemon::encode(bufferlist& bl, uint64_t features) const
diff --git a/src/mgr/ServiceMap.h b/src/mgr/ServiceMap.h
index d2a1c9b37c140..0c3304d6f1b82 100644
--- a/src/mgr/ServiceMap.h
+++ b/src/mgr/ServiceMap.h
@@ -24,19 +24,19 @@ struct ServiceMap {
     utime_t start_stamp;       ///< timestamp daemon started/registered
     std::map<std::string,std::string> metadata;  ///< static metadata
 
-    void encode(bufferlist& bl, uint64_t features) const;
-    void decode(bufferlist::const_iterator& p);
-    void dump(Formatter *f) const;
+    void encode(ceph::buffer::list& bl, uint64_t features) const;
+    void decode(ceph::buffer::list::const_iterator& p);
+    void dump(ceph::Formatter *f) const;
     static void generate_test_instances(std::list<Daemon*>& ls);
   };
 
   struct Service {
-    map<std::string,Daemon> daemons;
-    std::string summary;   ///< summary status string for 'ceph -s'
+    std::map<std::string,Daemon> daemons;
+    std::string summary;   ///< summary status std::string for 'ceph -s'
 
-    void encode(bufferlist& bl, uint64_t features) const;
-    void decode(bufferlist::const_iterator& p);
-    void dump(Formatter *f) const;
+    void encode(ceph::buffer::list& bl, uint64_t features) const;
+    void decode(ceph::buffer::list::const_iterator& p);
+    void dump(ceph::Formatter *f) const;
     static void generate_test_instances(std::list<Service*>& ls);
 
     std::string get_summary() const {
@@ -64,7 +64,7 @@ struct ServiceMap {
       return ss.str();
     }
 
-    void count_metadata(const string& field,
+    void count_metadata(const std::string& field,
 			std::map<std::string,int> *out) const {
       for (auto& p : daemons) {
 	auto q = p.second.metadata.find(field);
@@ -80,11 +80,11 @@ struct ServiceMap {
 
   epoch_t epoch = 0;
   utime_t modified;
-  map<std::string,Service> services;
+  std::map<std::string,Service> services;
 
-  void encode(bufferlist& bl, uint64_t features) const;
-  void decode(bufferlist::const_iterator& p);
-  void dump(Formatter *f) const;
+  void encode(ceph::buffer::list& bl, uint64_t features) const;
+  void decode(ceph::buffer::list::const_iterator& p);
+  void dump(ceph::Formatter *f) const;
   static void generate_test_instances(std::list<ServiceMap*>& ls);
 
   Daemon* get_daemon(const std::string& service,
-- 
2.39.5