summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpp/src/qpid/Msg.cpp1
-rw-r--r--cpp/src/qpid/broker/DtxManager.h3
2 files changed, 3 insertions, 1 deletions
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 <algorithm>
#include <string>
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<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);