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

1 files changed, 6 insertions, 3 deletions

diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.h b/cpp/src/qpid/cluster/ExpiryPolicy.h
index 4ec41c93bc..bdbe3a61dc 100644
--- a/cpp/src/qpid/cluster/ExpiryPolicy.h
+++ b/cpp/src/qpid/cluster/ExpiryPolicy.h
@@ -33,10 +33,13 @@
 namespace qpid {
 
 namespace broker {
-class Timer;
 class Message;
 }
 
+namespace sys {
+class Timer;
+}
+
 namespace cluster {
 class Multicaster;
 
@@ -46,7 +49,7 @@ class Multicaster;
 class ExpiryPolicy : public broker::ExpiryPolicy
 {
   public:
-    ExpiryPolicy(Multicaster&, const MemberId&, broker::Timer&);
+    ExpiryPolicy(Multicaster&, const MemberId&, sys::Timer&);
 
     void willExpire(broker::Message&);
     bool hasExpired(broker::Message&);
@@ -78,7 +81,7 @@ class ExpiryPolicy : public broker::ExpiryPolicy
     boost::intrusive_ptr<Expired> expiredPolicy;
     Multicaster& mcast;
     MemberId memberId;
-    broker::Timer& timer;
+    sys::Timer& timer;
 };
 
 }} // namespace qpid::cluster