3 files changed, 9 insertions, 11 deletions
diff --git a/qpid/cpp/src/tests/FieldTable.cpp b/qpid/cpp/src/tests/FieldTable.cpp
index 14f9eeb6e9..81372d87c5 100644
--- a/qpid/cpp/src/tests/FieldTable.cpp
+++ b/qpid/cpp/src/tests/FieldTable.cpp
@@ -75,11 +75,11 @@ QPID_AUTO_TEST_CASE(testAssignment)
         FieldTable c;
         c = a;
 
-        char* buff = static_cast<char*>(::alloca(c.encodedSize()));
-        Buffer wbuffer(buff, c.encodedSize());
+        std::vector<char> buff(c.encodedSize());
+        Buffer wbuffer(&buff[0], c.encodedSize());
         wbuffer.put(c);
 
-        Buffer rbuffer(buff, c.encodedSize());
+        Buffer rbuffer(&buff[0], c.encodedSize());
         rbuffer.get(d);
         BOOST_CHECK_EQUAL(c, d);
         BOOST_CHECK(string("CCCC") == c.getAsString("A"));
diff --git a/qpid/cpp/src/tests/MessageTest.cpp b/qpid/cpp/src/tests/MessageTest.cpp
index 7dd74361a9..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"
 
@@ -71,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);
diff --git a/qpid/cpp/src/tests/Uuid.cpp b/qpid/cpp/src/tests/Uuid.cpp
index d7d1f00e3c..aa9580e25e 100644
--- a/qpid/cpp/src/tests/Uuid.cpp
+++ b/qpid/cpp/src/tests/Uuid.cpp
@@ -19,7 +19,6 @@
 #include "qpid/framing/Uuid.h"
 #include "qpid/framing/Buffer.h"
 #include "qpid/types/Uuid.h"
-#include "qpid/sys/alloca.h"
 
 #include "unit_test.h"
 
@@ -97,12 +96,12 @@ QPID_AUTO_TEST_CASE(testUuidIOstream) {
 }
 
 QPID_AUTO_TEST_CASE(testUuidEncodeDecode) {
-    char* buff = static_cast<char*>(::alloca(Uuid::size()));
-    Buffer wbuf(buff, Uuid::size());
+    std::vector<char> buff(Uuid::size());
+    Buffer wbuf(&buff[0], Uuid::size());
     Uuid uuid(sample.c_array());
     uuid.encode(wbuf);
 
-    Buffer rbuf(buff, Uuid::size());
+    Buffer rbuf(&buff[0], Uuid::size());
     Uuid decoded;
     decoded.decode(rbuf);
     BOOST_CHECK_EQUAL(string(sample.begin(), sample.end()),