heartbeatmap: put in ceph namespace

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/common/HeartbeatMap.cc b/src/common/HeartbeatMap.cc
index 3f15b3829cfc343cd50ecaa9df6fcdbaf1d1e41e..c423268ddcb557c3cca6fdc8b184f29910aa22e8 100644 (file)
--- 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 fe0b932b5568262caeef15c0873890f56bc6261b..c82de2a71d62be302854f036eb3a4b4c0da2ac8b 100644 (file)
--- 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 ff41516188ba0ac338f7ac9f95bc9f1b49151bff..8083792cedb787fd00b8bacd93c3e6ddee7944e9 100644 (file)
--- 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 ac8c39b7d0991c8965c5abea0f9e588cc7502e9b..e78ab05bb04a333ccee1930118adcd9f97648e4e 100644 (file)
--- 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