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, 2 insertions, 5 deletions

diff --git a/cpp/src/qpid/broker/SessionState.h b/cpp/src/qpid/broker/SessionState.h
index 1d000fca5f..f9d35e2aac 100644
--- a/cpp/src/qpid/broker/SessionState.h
+++ b/cpp/src/qpid/broker/SessionState.h
@@ -48,10 +48,6 @@ namespace framing {
 class AMQP_ClientProxy;
 }
 
-namespace sys {
-struct TimerTask;
-}
-
 namespace broker {
 
 class Broker;
@@ -60,6 +56,7 @@ class Message;
 class SessionHandler;
 class SessionManager;
 class RateFlowcontrol;
+struct TimerTask;
 
 /**
  * Broker-side session state includes session's handler chains, which
@@ -156,7 +153,7 @@ class SessionState : public qpid::SessionState,
     // State used for producer flow control (rate limited)
     qpid::sys::Mutex rateLock;
     boost::scoped_ptr<RateFlowcontrol> rateFlowcontrol;
-    boost::intrusive_ptr<sys::TimerTask> flowControlTimer;
+    boost::intrusive_ptr<TimerTask> flowControlTimer;
 
     friend class SessionManager;
 };