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

common: Update config_obs_mgr.h to work without using namespace

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

diff --git a/src/common/config_obs_mgr.h b/src/common/config_obs_mgr.h
index 25a8b05ba4b5..06b3cf934a53 100644
--- a/src/common/config_obs_mgr.h
+++ b/src/common/config_obs_mgr.h
@@ -96,7 +96,7 @@ void ObserverMgr<ConfigObs>::for_each_change(const std::set<std::string>& change
 {
   // create the reverse observer mapping, mapping observers to the set of
   // changed keys that they'll get.
-  string val;
+  std::string val;
   for (auto& key : changes) {
     auto [first, last] = observers.equal_range(key);
     if ((oss) && !proxy.get_val(key, &val)) {