From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 29 Mar 2019 00:54:38 +0000 (-0400)
Subject: messages: Update MConfig.h to work without using namespace
X-Git-Tag: v15.0.0~19^2~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ee27ec3979f13dc6ce0b119630138f8b57f00d7;p=ceph.git

messages: Update MConfig.h to work without using namespace

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

diff --git a/src/messages/MConfig.h b/src/messages/MConfig.h
index ca0543a9c7d..6ea8d85e493 100644
--- a/src/messages/MConfig.h
+++ b/src/messages/MConfig.h
@@ -12,8 +12,8 @@ public:
   static constexpr int HEAD_VERSION = 1;
   static constexpr int COMPAT_VERSION = 1;
 
-  // use transparent comparator so we can lookup in it by string_view keys
-  std::map<string,string,std::less<>> config;
+  // use transparent comparator so we can lookup in it by std::string_view keys
+  std::map<std::string,std::string,std::less<>> config;
 
   MConfig() : MessageInstance(MSG_CONFIG, HEAD_VERSION, COMPAT_VERSION) { }
   MConfig(const std::map<std::string,std::string,std::less<>>& c)
@@ -26,7 +26,7 @@ public:
   std::string_view get_type_name() const override {
     return "config";
   }
-  void print(ostream& o) const override {
+  void print(std::ostream& o) const override {
     o << "config(" << config.size() << " keys" << ")";
   }