From f7248a708fad10a3e854b2131d3f2c686af9cc25 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Fri, 10 Jul 2009 21:42:11 +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@793121 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/ExpiryPolicy.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cpp/src/qpid/cluster/ExpiryPolicy.cpp') diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.cpp b/cpp/src/qpid/cluster/ExpiryPolicy.cpp index 348963f901..06bd3d3343 100644 --- a/cpp/src/qpid/cluster/ExpiryPolicy.cpp +++ b/cpp/src/qpid/cluster/ExpiryPolicy.cpp @@ -21,19 +21,19 @@ #include "ExpiryPolicy.h" #include "Multicaster.h" +#include "qpid/broker/Message.h" #include "qpid/framing/ClusterMessageExpiredBody.h" #include "qpid/sys/Time.h" -#include "qpid/broker/Message.h" -#include "qpid/broker/Timer.h" +#include "qpid/sys/Timer.h" #include "qpid/log/Statement.h" namespace qpid { namespace cluster { -ExpiryPolicy::ExpiryPolicy(Multicaster& m, const MemberId& id, broker::Timer& t) +ExpiryPolicy::ExpiryPolicy(Multicaster& m, const MemberId& id, sys::Timer& t) : expiryId(0), expiredPolicy(new Expired), mcast(m), memberId(id), timer(t) {} -struct ExpiryTask : public broker::TimerTask { +struct ExpiryTask : public sys::TimerTask { ExpiryTask(const boost::intrusive_ptr& policy, uint64_t id, sys::AbsTime when) : TimerTask(when), expiryPolicy(policy), expiryId(id) {} void fire() { expiryPolicy->sendExpire(expiryId); } -- cgit v1.2.1