From: Sage Weil <sage@redhat.com>
Date: Fri, 5 Dec 2014 22:21:08 +0000 (-0800)
Subject: common/ceph_context: don't import std namespace
X-Git-Tag: v0.80.11~58^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94aa947b33083bcfe3cb61f41bfdaea7df605cbb;p=ceph.git

common/ceph_context: don't import std namespace

This was broken by 7fed5dee4f96a83d1d6914f6fc0895bba2d15b99

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9029813b2784fe71879b1b7684855415b4c7566b)
---

diff --git a/src/common/ceph_context.h b/src/common/ceph_context.h
index e7b8b6c828e..7241c85583d 100644
--- a/src/common/ceph_context.h
+++ b/src/common/ceph_context.h
@@ -18,7 +18,6 @@
 #include <iostream>
 #include <stdint.h>
 #include <string>
-using namespace std;
 
 #include "include/buffer.h"
 #include "include/atomic.h"
@@ -109,7 +108,7 @@ public:
 		  bufferlist *out);
 
   template<typename T>
-  void lookup_or_create_singleton_object(T*& p, const string &name) {
+  void lookup_or_create_singleton_object(T*& p, const std::string &name) {
     ceph_spin_lock(&_associated_objs_lock);
     if (!_associated_objs.count(name)) {
       p = new T(this);
@@ -156,7 +155,7 @@ private:
   ceph::HeartbeatMap *_heartbeat_map;
 
   ceph_spinlock_t _associated_objs_lock;
-  map<string, AssociatedSingletonObject*> _associated_objs;
+  std::map<std::string, AssociatedSingletonObject*> _associated_objs;
 
   // crypto
   CryptoNone *_crypto_none;