* cpp/lib/common/framing/MethodContext.h: Reduced MethodContext to

  ChannelAdapter and Method Body. Request ID comes from body,
  ChannelAdapter is used to send frames, not OutputHandler.

* cpp/lib/common/framing/ChannelAdapter.h,.cpp: Removed context member.
  Context is per-method not per-channel.

* cpp/lib/broker/*: Replace direct use of OutputHandler and ChannelId
  with MethodContext (for responses) or ChannelAdapter (for requests.)
  Use context request-ID to construct responses, send all bodies via
  ChannelAdapter.

* cpp/lib/broker/BrokerAdapter.cpp:  Link broker::Channel to BrokerAdapter.

* cpp/lib/broker/*: Remove unnecessary ProtocolVersion parameters.
  Fix bogus signatures: ProtocolVersion* -> const ProtocolVersion&

* Cosmetic changes, many files:
 - fixed indentation, broke long lines.
 - removed unnecessary qpid:: prefixes.

* broker/BrokerAdapter,BrokerChannel: Merged BrokerAdapter into
  broker::channel.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@502767 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 16 insertions, 17 deletions

diff --git a/cpp/lib/broker/BrokerMessageMessage.cpp b/cpp/lib/broker/BrokerMessageMessage.cpp
index 46f583b978..4168ff639c 100644
--- a/cpp/lib/broker/BrokerMessageMessage.cpp
+++ b/cpp/lib/broker/BrokerMessageMessage.cpp
@@ -22,29 +22,28 @@
 
 using namespace qpid::broker;
 	
-MessageMessage::MessageMessage(const qpid::framing::AMQMethodBody& _methodBody, 
-                 const std::string& _exchange, const std::string& _routingKey, 
-                 bool _mandatory, bool _immediate) :
-	Message(_exchange, _routingKey, _mandatory, _immediate),
-	methodBody(_methodBody)
+MessageMessage::MessageMessage(
+    const qpid::framing::AMQMethodBody::shared_ptr _methodBody, 
+    const std::string& _exchange, const std::string& _routingKey, 
+    bool _mandatory, bool _immediate) :
+    Message(_exchange, _routingKey, _mandatory, _immediate, _methodBody),
+    methodBody(_methodBody)
 {
 }
 
-void MessageMessage::deliver(qpid::framing::OutputHandler* /*out*/, 
-	int /*channel*/, 
-	const std::string& /*consumerTag*/, 
-	u_int64_t /*deliveryTag*/, 
-	u_int32_t /*framesize*/,
-	qpid::framing::ProtocolVersion* /*version*/)
+void MessageMessage::deliver(
+    framing::ChannelAdapter& /*out*/, 
+    const std::string& /*consumerTag*/, 
+    u_int64_t /*deliveryTag*/, 
+    u_int32_t /*framesize*/)
 {
 }
 
-void MessageMessage::sendGetOk(qpid::framing::OutputHandler* /*out*/, 
-	int /*channel*/, 
-	u_int32_t /*messageCount*/,
-	u_int64_t /*deliveryTag*/, 
-	u_int32_t /*framesize*/,
-	qpid::framing::ProtocolVersion* /*version*/)
+void MessageMessage::sendGetOk(
+    const framing::MethodContext& /*context*/, 
+    u_int32_t /*messageCount*/,
+    u_int64_t /*deliveryTag*/, 
+    u_int32_t /*framesize*/)
 {
 }