diff options
| author | Gordon Sim <gsim@apache.org> | 2011-08-26 12:51:37 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2011-08-26 12:51:37 +0000 |
| commit | 4aa76f3dc4ca2e73a55e6a90027841139828dcdf (patch) | |
| tree | 19fd6fa7bb3cecb4a9af23c25081886ecf40d009 | |
| parent | 78ee8df255be3c8bce2bfe747eecdbcd7f1e78cf (diff) | |
| download | qpid-python-4aa76f3dc4ca2e73a55e6a90027841139828dcdf.tar.gz | |
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@1162092 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/Msg.cpp | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/DtxManager.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/Msg.cpp b/qpid/cpp/src/qpid/Msg.cpp index d441cdd180..eb0f26d67b 100644 --- a/qpid/cpp/src/qpid/Msg.cpp +++ b/qpid/cpp/src/qpid/Msg.cpp @@ -20,6 +20,7 @@ */ #include "qpid/Msg.h" +#include <algorithm> #include <string> namespace qpid { diff --git a/qpid/cpp/src/qpid/broker/DtxManager.h b/qpid/cpp/src/qpid/broker/DtxManager.h index b85bcd7e76..11895695a3 100644 --- a/qpid/cpp/src/qpid/broker/DtxManager.h +++ b/qpid/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<class F> 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); |