QPID-3921: C++ header files need tidyup

Tidied up header use of FieldValue.h
- Removed all unnecessary includes of FieldValue.h from other header
  files especially Array.h. (This avoids the world recompiling when working
  on FieldValue!)
- Corrected up header guards in Array.h

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

1 files changed, 3 insertions, 2 deletions

diff --git a/qpid/cpp/src/tests/qpid-txtest.cpp b/qpid/cpp/src/tests/qpid-txtest.cpp
index d0ba2f1245..6e7d46802c 100644
--- a/qpid/cpp/src/tests/qpid-txtest.cpp
+++ b/qpid/cpp/src/tests/qpid-txtest.cpp
@@ -33,6 +33,7 @@
 #include "qpid/client/SubscriptionManager.h"
 #include "qpid/framing/Array.h"
 #include "qpid/framing/Buffer.h"
+#include "qpid/framing/FieldValue.h"
 #include "qpid/framing/Uuid.h"
 #include "qpid/sys/Thread.h"
 
@@ -245,10 +246,10 @@ struct Controller : public Client
 
         // Recover DTX transactions (if any)
         if (opts.dtx) {
-            std::vector<std::string> inDoubtXids;
             framing::DtxRecoverResult dtxRes = session.dtxRecover().get();
             const framing::Array& xidArr = dtxRes.getInDoubt();
-            xidArr.collect(inDoubtXids);
+            std::vector<std::string> inDoubtXids(xidArr.size());
+            std::transform(xidArr.begin(), xidArr.end(), inDoubtXids.begin(), framing::Array::get<std::string, framing::Array::ValuePtr>);
 
             if (inDoubtXids.size()) {
                 if (!opts.quiet) std::cout << "Recovering DTX in-doubt transaction(s):" << std::endl;