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, 4 insertions, 2 deletions

diff --git a/qpid/cpp/src/tests/FramingTest.cpp b/qpid/cpp/src/tests/FramingTest.cpp
index 9e82447ffa..0c7adb2af8 100644
--- a/qpid/cpp/src/tests/FramingTest.cpp
+++ b/qpid/cpp/src/tests/FramingTest.cpp
@@ -147,7 +147,8 @@ class FramingTest : public CppUnit::TestCase
         Buffer wbuff(buffer, sizeof(buffer));
         std::string a = "hostA";
         std::string b = "hostB";
-        AMQFrame in(999, ConnectionRedirectBody(version, a, b));
+        AMQFrame in(in_place<ConnectionRedirectBody>(version, a, b));
+        in.setChannel(999);
         in.encode(wbuff);
 
         Buffer rbuff(buffer, sizeof(buffer));
@@ -160,7 +161,8 @@ class FramingTest : public CppUnit::TestCase
     {
         Buffer wbuff(buffer, sizeof(buffer));
         std::string s = "hostA";
-        AMQFrame in(999, BasicConsumeOkBody(version, s));
+        AMQFrame in(in_place<BasicConsumeOkBody>(version, s));
+        in.setChannel(999);
         in.encode(wbuff);
 
         Buffer rbuff(buffer, sizeof(buffer));