* cpp/gen/Makefile.am: fixed generated code dependencies.

	* *Channel,SessionHandlerImpl,FramingTest: added FieldTable argument
	  to consume() to conform to updated XML.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@488745 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 5 deletions

diff --git a/qpid/cpp/lib/broker/SessionHandlerImpl.cpp b/qpid/cpp/lib/broker/SessionHandlerImpl.cpp
index ad203b4515..bd6ca9dee9 100644
--- a/qpid/cpp/lib/broker/SessionHandlerImpl.cpp
+++ b/qpid/cpp/lib/broker/SessionHandlerImpl.cpp
@@ -360,10 +360,12 @@ void SessionHandlerImpl::BasicHandlerImpl::qos(u_int16_t channel, u_int32_t pref
     parent->client->getBasic().qosOk(channel);
 } 
         
-void SessionHandlerImpl::BasicHandlerImpl::consume(u_int16_t channelId, u_int16_t /*ticket*/, 
-                                                   const string& queueName, const string& consumerTag, 
-                                                   bool noLocal, bool noAck, bool exclusive, 
-                                                   bool nowait){
+void SessionHandlerImpl::BasicHandlerImpl::consume(
+    u_int16_t channelId, u_int16_t /*ticket*/, 
+    const string& queueName, const string& consumerTag, 
+    bool noLocal, bool noAck, bool exclusive, 
+    bool nowait, const FieldTable& fields)
+{
     
     Queue::shared_ptr queue = parent->getQueue(queueName, channelId);    
     Channel* channel = parent->channels[channelId];
@@ -373,7 +375,8 @@ void SessionHandlerImpl::BasicHandlerImpl::consume(u_int16_t channelId, u_int16_
 
     try{
         string newTag = consumerTag;
-        channel->consume(newTag, queue, !noAck, exclusive, noLocal ? parent : 0);
+        channel->consume(
+            newTag, queue, !noAck, exclusive, noLocal ? parent : 0, &fields);
 
         if(!nowait) parent->client->getBasic().consumeOk(channelId, newTag);