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/qpid@597513 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 5 deletions

diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp
index 6636c59bf5..7aad7e7ce1 100644
--- a/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/cpp/src/qpid/management/ManagementAgent.cpp
@@ -98,15 +98,14 @@ void ManagementAgent::SendBuffer (Buffer&  buf,
                                   string   routingKey)
 {
     intrusive_ptr<Message> msg (new Message ());
-    AMQFrame method  (0, MessageTransferBody(ProtocolVersion(),
-                                             0, exchange->getName (), 0, 0));
-    AMQFrame header  (0, AMQHeaderBody());
-    AMQFrame content;
+    AMQFrame method (in_place<MessageTransferBody>(
+                         ProtocolVersion(), 0, exchange->getName (), 0, 0));
+    AMQFrame header (in_place<AMQHeaderBody>());
+    AMQFrame content(in_place<AMQContentBody>());
 
     QPID_LOG (debug, "ManagementAgent::SendBuffer - key="
               << routingKey << " len=" << length);
 
-    content.setBody(AMQContentBody());
     content.castBody<AMQContentBody>()->decode(buf, length);
 
     method.setEof  (false);