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

common: Update config_values.h to work without using namespace

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

diff --git a/src/common/config_values.h b/src/common/config_values.h
index fe7b36a40a78..51f792353329 100644
--- a/src/common/config_values.h
+++ b/src/common/config_values.h
@@ -17,7 +17,7 @@
 // debug logging settings, and some other "unnamed" settings, like entity name of
 // the daemon.
 class ConfigValues {
-  using values_t = std::map<std::string_view, map<int32_t,Option::value_t>>;
+  using values_t = std::map<std::string_view, std::map<int32_t,Option::value_t>>;
   values_t values;
   // for populating md_config_impl::legacy_values in ctor
   friend struct md_config_t;
@@ -25,7 +25,7 @@ class ConfigValues {
 public:
   EntityName name;
   /// cluster name
-  string cluster;
+  std::string cluster;
   ceph::logging::SubsystemMap subsys;
   bool no_mon_config = false;
   // Set of configuration options that have changed since the last