Author: chug
Date: Thu Mar 29 18:17:22 2012
New Revision: 1307025
URL: http://svn.apache.org/viewvc?rev=1307025&view=rev
Log:
QPID-3921 C++ header files need tidyup
Windows build needs same treatment as rest of the files in r1306595
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
qpid/trunk/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp?rev=1307025&r1=1307024&r2=1307025&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp Thu Mar
29 18:17:22 2012
@@ -25,6 +25,7 @@
#include "qpid/broker/Connection.h"
#include "qpid/log/Statement.h"
#include "qpid/framing/reply_exceptions.h"
+#include "qpid/framing/FieldValue.h"
#include <windows.h>
Modified: qpid/trunk/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp?rev=1307025&r1=1307024&r2=1307025&view=diff
==============================================================================
--- qpid/trunk/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp (original)
+++ qpid/trunk/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp Thu Mar 29
18:17:22 2012
@@ -49,6 +49,7 @@
#include "qpid/client/AsyncSession.h"
#include "qpid/client/Connection.h"
+#include "qpid/framing/FieldValue.h"
#include <map>
@@ -472,13 +473,15 @@ INT ResourceManager::recover(XID *xids,
try {
// status if we can't talk to the broker
status = XAER_RMFAIL;
- std::vector<std::string> wireFormatXids;
DtxRecoverResult dtxrr = qpidSession.dtxRecover(true);
// status if we can't process the xids
status = XAER_RMERR;
- dtxrr.getInDoubt().collect(wireFormatXids);
+
+ std::vector<std::string> wireFormatXids(dtxrr.getInDoubt().size());
+ std::transform(dtxrr.getInDoubt().begin(), dtxrr.getInDoubt().end(),
wireFormatXids.begin(), Array::get<std::string, Array::ValuePtr>);
+
size_t nXids = wireFormatXids.size();
if (nXids > 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
