From cc02bf5da0caa5272dc2559aa69ca51ac559e473 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 28 Mar 2019 21:39:36 -0400 Subject: [PATCH] common: Update WorkQueue.h to work without using namespace Signed-off-by: Adam C. Emerson --- src/common/WorkQueue.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/WorkQueue.h b/src/common/WorkQueue.h index a978a6d6984..d53fc0f91c6 100644 --- a/src/common/WorkQueue.h +++ b/src/common/WorkQueue.h @@ -56,13 +56,13 @@ public: class TPHandle { friend class ThreadPool; CephContext *cct; - heartbeat_handle_d *hb; + ceph::heartbeat_handle_d *hb; ceph::coarse_mono_clock::rep grace; ceph::coarse_mono_clock::rep suicide_grace; public: TPHandle( CephContext *cct, - heartbeat_handle_d *hb, + ceph::heartbeat_handle_d *hb, time_t grace, time_t suicide_grace) : cct(cct), hb(hb), grace(grace), suicide_grace(suicide_grace) {} @@ -656,11 +656,11 @@ public: BaseShardedWQ(time_t ti, time_t sti):timeout_interval(ti), suicide_interval(sti) {} virtual ~BaseShardedWQ() {} - virtual void _process(uint32_t thread_index, heartbeat_handle_d *hb ) = 0; + virtual void _process(uint32_t thread_index, ceph::heartbeat_handle_d *hb ) = 0; virtual void return_waiting_threads() = 0; virtual void stop_return_waiting_threads() = 0; virtual bool is_shard_empty(uint32_t thread_index) = 0; - }; + }; template class ShardedWQ: public BaseShardedWQ { -- 2.39.5