diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-07-31 19:53:30 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-07-31 19:53:30 +0000 |
| commit | 5d23a8654f923371b4912a9d48bbf927fa50fa65 (patch) | |
| tree | d24980716a759fde43bca4347589814a31527cd8 | |
| parent | 30057848b8044a31631a55b768cc0675b56811d4 (diff) | |
| download | qpid-python-5d23a8654f923371b4912a9d48bbf927fa50fa65.tar.gz | |
Fix build warnings/errors on Windows
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@799720 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/qpid/broker/DtxManager.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/SessionState.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/DtxManager.cpp b/cpp/src/qpid/broker/DtxManager.cpp index 64c59295f1..a2ab20ec44 100644 --- a/cpp/src/qpid/broker/DtxManager.cpp +++ b/cpp/src/qpid/broker/DtxManager.cpp @@ -22,6 +22,7 @@ #include "qpid/broker/DtxTimeout.h" #include "qpid/framing/reply_exceptions.h" #include "qpid/log/Statement.h" +#include "qpid/sys/Timer.h" #include "qpid/ptr_map.h" #include <boost/format.hpp> @@ -33,7 +34,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(qpid::sys::Timer& t) : store(0), timer(t) {} DtxManager::~DtxManager() {} diff --git a/cpp/src/qpid/broker/SessionState.h b/cpp/src/qpid/broker/SessionState.h index 3831be6cb5..67fd4f4f38 100644 --- a/cpp/src/qpid/broker/SessionState.h +++ b/cpp/src/qpid/broker/SessionState.h @@ -49,7 +49,7 @@ class AMQP_ClientProxy; } namespace sys { -struct TimerTask; +class TimerTask; } namespace broker { |