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/broker/DtxManager.cpp | |
| 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/broker/DtxManager.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/DtxManager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/DtxManager.cpp b/cpp/src/qpid/broker/DtxManager.cpp index a9bdb5e152..11e16ec837 100644 --- a/cpp/src/qpid/broker/DtxManager.cpp +++ b/cpp/src/qpid/broker/DtxManager.cpp @@ -33,7 +33,7 @@ using qpid::ptr_map_ptr; using namespace qpid::broker; using namespace qpid::framing; -DtxManager::DtxManager(sys::Timer& t) : store(0), timer(t) {} +DtxManager::DtxManager(Timer& t) : store(0), timer(t) {} DtxManager::~DtxManager() {} @@ -130,7 +130,8 @@ void DtxManager::setTimeout(const std::string& xid, uint32_t secs) } timeout = intrusive_ptr<DtxTimeout>(new DtxTimeout(secs, *this, xid)); record->setTimeout(timeout); - timer.add(timeout); + timer.add(boost::static_pointer_cast<TimerTask>(timeout)); + } uint32_t DtxManager::getTimeout(const std::string& xid) |