From e68e4f3321ebb8e19ad9b6a8e8a8d805eee325fd Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 28 Jul 2011 09:15:07 -0700
Subject: [PATCH] heartbeatmap: put in ceph namespace

Signed-off-by: Sage Weil <sage@newdream.net>
---
 src/common/HeartbeatMap.cc | 2 ++
 src/common/HeartbeatMap.h  | 3 +++
 src/common/ceph_context.cc | 2 ++
 src/common/ceph_context.h  | 9 ++++++---
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/common/HeartbeatMap.cc b/src/common/HeartbeatMap.cc
index 3f15b3829cfc3..c423268ddcb55 100644
--- a/src/common/HeartbeatMap.cc
+++ b/src/common/HeartbeatMap.cc
@@ -22,6 +22,7 @@
 #undef dout_prefix
 #define dout_prefix *_dout << "heartbeat_map "
 
+namespace ceph {
 
 HeartbeatMap::HeartbeatMap(CephContext *cct)
   : m_cct(cct),
@@ -85,3 +86,4 @@ bool HeartbeatMap::is_healthy()
   return healthy;
 }
 
+}
diff --git a/src/common/HeartbeatMap.h b/src/common/HeartbeatMap.h
index fe0b932b55682..c82de2a71d62b 100644
--- a/src/common/HeartbeatMap.h
+++ b/src/common/HeartbeatMap.h
@@ -24,6 +24,8 @@
 
 class CephContext;
 
+namespace ceph {
+
 struct heartbeat_handle_d {
   pthread_t thread;
   std::string name;
@@ -55,4 +57,5 @@ class HeartbeatMap {
   std::list<heartbeat_handle_d*> m_workers;
 };
 
+}
 #endif
diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index ff41516188ba0..8083792cedb78 100644
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -25,6 +25,8 @@
 #include <pthread.h>
 #include <semaphore.h>
 
+using ceph::HeartbeatMap;
+
 class CephContextServiceThread : public Thread
 {
 public:
diff --git a/src/common/ceph_context.h b/src/common/ceph_context.h
index ac8c39b7d0991..e78ab05bb04a3 100644
--- a/src/common/ceph_context.h
+++ b/src/common/ceph_context.h
@@ -28,7 +28,10 @@ class DoutLocker;
 class PerfCountersCollection;
 class md_config_obs_t;
 class md_config_t;
-class HeartbeatMap;
+
+namespace ceph {
+  class HeartbeatMap;
+}
 
 /* A CephContext represents the context held by a single library user.
  * There can be multiple CephContexts in the same process.
@@ -63,7 +66,7 @@ public:
   /* Get the PerfCountersCollection of this CephContext */
   PerfCountersCollection *GetPerfCountersCollection();
 
-  HeartbeatMap *get_heartbeat_map() {
+  ceph::HeartbeatMap *get_heartbeat_map() {
     return _heartbeat_map;
   }
 
@@ -92,7 +95,7 @@ private:
 
   md_config_obs_t *_perf_counters_conf_obs;
 
-  HeartbeatMap *_heartbeat_map;
+  ceph::HeartbeatMap *_heartbeat_map;
 };
 
 #endif
-- 
2.39.5