From f1dd40f456e5808f81750e88bb2dd1b025ab868b Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 26 Aug 2011 12:51:37 +0000 Subject: QPID-3384: Fix compilation errors for boost 1.39 and gcc 4.4.4 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1162092 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/Msg.cpp | 1 + cpp/src/qpid/broker/DtxManager.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'cpp/src') diff --git a/cpp/src/qpid/Msg.cpp b/cpp/src/qpid/Msg.cpp index d441cdd180..eb0f26d67b 100644 --- a/cpp/src/qpid/Msg.cpp +++ b/cpp/src/qpid/Msg.cpp @@ -20,6 +20,7 @@ */ #include "qpid/Msg.h" +#include #include namespace qpid { diff --git a/cpp/src/qpid/broker/DtxManager.h b/cpp/src/qpid/broker/DtxManager.h index b85bcd7e76..11895695a3 100644 --- a/cpp/src/qpid/broker/DtxManager.h +++ b/cpp/src/qpid/broker/DtxManager.h @@ -27,6 +27,7 @@ #include "qpid/broker/TransactionalStore.h" #include "qpid/framing/amqp_types.h" #include "qpid/sys/Mutex.h" +#include "qpid/ptr_map.h" namespace qpid { namespace broker { @@ -69,7 +70,7 @@ public: // Used by cluster for replication. template void each(F f) const { for (WorkMap::const_iterator i = work.begin(); i != work.end(); ++i) - f(*i); + f(*ptr_map_ptr(i)); } DtxWorkRecord* getWork(const std::string& xid); bool exists(const std::string& xid); -- cgit v1.2.1