Reverted checkins 793119, 793120, 793121, 793122 because of problems with heartbeats and the store tests.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@793602 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 4 deletions

diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.cpp b/cpp/src/qpid/cluster/ExpiryPolicy.cpp
index 06bd3d3343..348963f901 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/sys/Timer.h"
+#include "qpid/broker/Message.h"
+#include "qpid/broker/Timer.h"
 #include "qpid/log/Statement.h"
 
 namespace qpid {
 namespace cluster {
 
-ExpiryPolicy::ExpiryPolicy(Multicaster& m, const MemberId& id, sys::Timer& t)
+ExpiryPolicy::ExpiryPolicy(Multicaster& m, const MemberId& id, broker::Timer& t)
     : expiryId(0), expiredPolicy(new Expired), mcast(m), memberId(id), timer(t) {}
 
-struct ExpiryTask : public sys::TimerTask {
+struct ExpiryTask : public broker::TimerTask {
     ExpiryTask(const boost::intrusive_ptr<ExpiryPolicy>& policy, uint64_t id, sys::AbsTime when)
         : TimerTask(when), expiryPolicy(policy), expiryId(id) {}
     void fire() { expiryPolicy->sendExpire(expiryId); }