diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2009-07-13 15:00:58 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2009-07-13 15:00:58 +0000 |
| commit | 15daf8342812786490f8a8dabcc5ba3cee8593e6 (patch) | |
| tree | 69ce95f978a7c6b7cfded0f025ffce7b1dd5d220 /cpp/src/qpid/sys/Timer.h | |
| parent | b7ec99208bb38dc0cad3a7fd42b8e652610a192a (diff) | |
| download | qpid-python-15daf8342812786490f8a8dabcc5ba3cee8593e6.tar.gz | |
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
Diffstat (limited to 'cpp/src/qpid/sys/Timer.h')
| -rw-r--r-- | cpp/src/qpid/sys/Timer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/qpid/sys/Timer.h b/cpp/src/qpid/sys/Timer.h index fc7491d5ed..b5bf5d8a4c 100644 --- a/cpp/src/qpid/sys/Timer.h +++ b/cpp/src/qpid/sys/Timer.h @@ -42,7 +42,6 @@ class TimerTask : public RefCounted { friend bool operator<(const boost::intrusive_ptr<TimerTask>&, const boost::intrusive_ptr<TimerTask>&); - AbsTime sortTime; Duration period; AbsTime nextFireTime; Mutex callbackLock; @@ -72,7 +71,7 @@ bool operator<(const boost::intrusive_ptr<TimerTask>& a, const boost::intrusive_ptr<TimerTask>& b); class Timer : private Runnable { - qpid::sys::Monitor monitor; + qpid::sys::Monitor monitor; std::priority_queue<boost::intrusive_ptr<TimerTask> > tasks; qpid::sys::Thread runner; bool active; |