merge non-java changes from trunk up to r1353860

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-config-and-management@1354874 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 4 deletions

diff --git a/qpid/cpp/src/tests/MessageTest.cpp b/qpid/cpp/src/tests/MessageTest.cpp
index 7d67c92b37..3a3ed061f9 100644
--- a/qpid/cpp/src/tests/MessageTest.cpp
+++ b/qpid/cpp/src/tests/MessageTest.cpp
@@ -24,7 +24,6 @@
 #include "qpid/framing/MessageTransferBody.h"
 #include "qpid/framing/FieldValue.h"
 #include "qpid/framing/Uuid.h"
-#include "qpid/sys/alloca.h"
 
 #include "unit_test.h"
 
@@ -33,6 +32,8 @@
 using namespace qpid::broker;
 using namespace qpid::framing;
 
+using std::string;
+
 namespace qpid {
 namespace tests {
 
@@ -69,11 +70,11 @@ QPID_AUTO_TEST_CASE(testEncodeDecode)
     dProps->setDeliveryMode(PERSISTENT);
     BOOST_CHECK(msg->isPersistent());
 
-    char* buff = static_cast<char*>(::alloca(msg->encodedSize()));
-    Buffer wbuffer(buff, msg->encodedSize());
+    std::vector<char> buff(msg->encodedSize());
+    Buffer wbuffer(&buff[0], msg->encodedSize());
     msg->encode(wbuffer);
 
-    Buffer rbuffer(buff, msg->encodedSize());
+    Buffer rbuffer(&buff[0], msg->encodedSize());
     msg = new Message();
     msg->decodeHeader(rbuffer);
     msg->decodeContent(rbuffer);