summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/broker/MessageDelivery.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/qpid/broker/MessageDelivery.cpp')
-rw-r--r--cpp/src/qpid/broker/MessageDelivery.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/MessageDelivery.cpp b/cpp/src/qpid/broker/MessageDelivery.cpp
index d7f8bceae1..886008c213 100644
--- a/cpp/src/qpid/broker/MessageDelivery.cpp
+++ b/cpp/src/qpid/broker/MessageDelivery.cpp
@@ -52,8 +52,9 @@ struct BasicGetToken : BaseToken
AMQFrame sendMethod(intrusive_ptr<Message> msg, DeliveryId id)
{
- return AMQFrame(0, BasicGetOkBody(
- ProtocolVersion(), id.getValue(), msg->getRedelivered(), msg->getExchangeName(),
+ return AMQFrame(in_place<BasicGetOkBody>(
+ ProtocolVersion(), id.getValue(),
+ msg->getRedelivered(), msg->getExchangeName(),
msg->getRoutingKey(), queue->getMessageCount()));
}
};
@@ -68,9 +69,10 @@ struct BasicConsumeToken : BaseToken
AMQFrame sendMethod(intrusive_ptr<Message> msg, DeliveryId id)
{
- return AMQFrame(0, BasicDeliverBody(
+ return AMQFrame(in_place<BasicDeliverBody>(
ProtocolVersion(), consumer, id.getValue(),
- msg->getRedelivered(), msg->getExchangeName(), msg->getRoutingKey()));
+ msg->getRedelivered(), msg->getExchangeName(),
+ msg->getRoutingKey()));
}
};
@@ -90,7 +92,9 @@ struct MessageDeliveryToken : BaseToken
if (msg->getRedelivered()){
msg->getProperties<DeliveryProperties>()->setRedelivered(true);
}
- return AMQFrame(0, MessageTransferBody(ProtocolVersion(), 0, destination, confirmMode, acquireMode));
+ return AMQFrame(in_place<MessageTransferBody>(
+ ProtocolVersion(), 0, destination,
+ confirmMode, acquireMode));
}
};