Added framing::BodyHolder:

 - Uniform holder for all body types, replaces MethodHolder.
 - Uses in_place constructors to avoid avoid body copy.

framing::AMQFrame:
 - Holds body in heap-allocated intrusive_ptr<BodyHolder>
 - Uses in_place constructors to avoid avoid body copy.

Removed/downgraded to TODO many redundant FIXME comments.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@597513 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 f5239165b0..f683eaad68 100644
--- a/qpid/cpp/src/tests/MessageTest.cpp
+++ b/qpid/cpp/src/tests/MessageTest.cpp
@@ -51,10 +51,11 @@ class MessageTest : public CppUnit::TestCase
 
         intrusive_ptr<Message> msg(new Message());
 
-        AMQFrame method(0, MessageTransferBody(ProtocolVersion(), 0, exchange, 0, 0));
-        AMQFrame header(0, AMQHeaderBody());
-        AMQFrame content1(0, AMQContentBody(data1));
-        AMQFrame content2(0, AMQContentBody(data2));
+        AMQFrame method(in_place<MessageTransferBody>(
+                            ProtocolVersion(), 0, exchange, 0, 0));
+        AMQFrame header(in_place<AMQHeaderBody>());
+        AMQFrame content1(in_place<AMQContentBody>(data1));
+        AMQFrame content2(in_place<AMQContentBody>(data2));
 
         msg->getFrames().append(method);
         msg->getFrames().append(header);