QPID-3921 C++ header files need tidyup

Windows build needs same treatment as rest of the files in r1306595


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1307025 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 6 insertions, 2 deletions

diff --git a/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp b/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
index 2acc09cded..a38e6ac12a 100644
--- a/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
+++ b/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
@@ -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>
 
diff --git a/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp b/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
index 33d125e3c6..ec98289923 100644
--- a/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
+++ b/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
@@ -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, long count, long flags) {
 	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) {