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

messages: Update MGetConfig.h to work without using namespace

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

diff --git a/src/messages/MGetConfig.h b/src/messages/MGetConfig.h
index 0e548576f79b6..aa8429fc74b23 100644
--- a/src/messages/MGetConfig.h
+++ b/src/messages/MGetConfig.h
@@ -13,11 +13,11 @@ public:
   static constexpr int COMPAT_VERSION = 1;
 
   EntityName name;  ///< e.g., mon.a, client.foo
-  string host;      ///< our hostname
-  string device_class;
+  std::string host;      ///< our hostname
+  std::string device_class;
 
   MGetConfig() : MessageInstance(MSG_GET_CONFIG, HEAD_VERSION, COMPAT_VERSION) { }
-  MGetConfig(const EntityName& n, const string& h)
+  MGetConfig(const EntityName& n, const std::string& h)
     : MessageInstance(MSG_GET_CONFIG, HEAD_VERSION, COMPAT_VERSION),
       name(n),
       host(h) {}
@@ -25,7 +25,7 @@ public:
   std::string_view get_type_name() const override {
     return "get_config";
   }
-  void print(ostream& o) const override {
+  void print(std::ostream& o) const override {
     o << "get_config(" << name << "@" << host;
     if (device_class.size()) {
       o << " device_class " << device_class;