From 9c095c4cd694287151cc1fabcc274fd435944dee Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Thu, 30 Jul 2009 14:06:49 +0000 Subject: Change all broker users of broker::Timer to use sys::Timer git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@799273 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/management/ManagementAgent.cpp | 2 +- cpp/src/qpid/management/ManagementAgent.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cpp/src/qpid/management') diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp index 3ea38ca45e..8cf7f7878a 100644 --- a/cpp/src/qpid/management/ManagementAgent.cpp +++ b/cpp/src/qpid/management/ManagementAgent.cpp @@ -92,7 +92,7 @@ void ManagementAgent::configure(const string& _dataDir, uint16_t _interval, broker = _broker; threadPoolSize = _threads; ManagementObject::maxThreads = threadPoolSize; - timer.add (intrusive_ptr (new Periodic(*this, interval))); + timer.add (new Periodic(*this, interval)); // Get from file or generate and save to file. if (dataDir.empty()) diff --git a/cpp/src/qpid/management/ManagementAgent.h b/cpp/src/qpid/management/ManagementAgent.h index c9c9b3f66d..e1bb83cfea 100644 --- a/cpp/src/qpid/management/ManagementAgent.h +++ b/cpp/src/qpid/management/ManagementAgent.h @@ -24,9 +24,9 @@ #include "qpid/broker/BrokerImportExport.h" #include "qpid/Options.h" #include "qpid/broker/Exchange.h" -#include "qpid/broker/Timer.h" #include "qpid/framing/Uuid.h" #include "qpid/sys/Mutex.h" +#include "qpid/sys/Timer.h" #include "qpid/broker/ConnectionToken.h" #include "qpid/management/ManagementObject.h" #include "qpid/management/ManagementEvent.h" @@ -98,7 +98,7 @@ public: void disallow(const std::string& className, const std::string& methodName, const std::string& message); private: - struct Periodic : public qpid::broker::TimerTask + struct Periodic : public qpid::sys::TimerTask { ManagementAgent& agent; @@ -183,7 +183,7 @@ private: framing::Uuid uuid; sys::Mutex addLock; sys::Mutex userLock; - qpid::broker::Timer timer; + qpid::sys::Timer timer; qpid::broker::Exchange::shared_ptr mExchange; qpid::broker::Exchange::shared_ptr dExchange; std::string dataDir; -- cgit v1.2.1