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/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 717e1a47cd..190eeb7293 100644 --- a/cpp/src/qpid/cluster/ExpiryPolicy.cpp +++ b/cpp/src/qpid/cluster/ExpiryPolicy.cpp @@ -19,21 +19,21 @@ * */ +#include "qpid/broker/Message.h" #include "qpid/cluster/ExpiryPolicy.h" #include "qpid/cluster/Multicaster.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