Author: gsim
Date: Fri Aug 26 12:51:37 2011
New Revision: 1162092
URL: http://svn.apache.org/viewvc?rev=1162092&view=rev
Log:
QPID-3384: Fix compilation errors for boost 1.39 and gcc 4.4.4
Modified:
qpid/trunk/qpid/cpp/src/qpid/Msg.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/DtxManager.h
Modified: qpid/trunk/qpid/cpp/src/qpid/Msg.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/Msg.cpp?rev=1162092&r1=1162091&r2=1162092&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/Msg.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/Msg.cpp Fri Aug 26 12:51:37 2011
@@ -20,6 +20,7 @@
*/
#include "qpid/Msg.h"
+#include <algorithm>
#include <string>
namespace qpid {
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/DtxManager.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/DtxManager.h?rev=1162092&r1=1162091&r2=1162092&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/DtxManager.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/DtxManager.h Fri Aug 26 12:51:37 2011
@@ -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);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
