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

1 files changed, 10 insertions, 4 deletions

diff --git a/cpp/lib/client/ClientChannel.cpp b/cpp/lib/client/ClientChannel.cpp
index ba21199732..c7b8e39ae5 100644
--- a/cpp/lib/client/ClientChannel.cpp
+++ b/cpp/lib/client/ClientChannel.cpp
@@ -124,11 +124,17 @@ void Channel::bind(const Exchange& exchange, const Queue& queue, const std::stri
     }
 }
 
-void Channel::consume(Queue& queue, std::string& tag, MessageListener* listener, 
-                      int ackMode, bool noLocal, bool synch){
-
+void Channel::consume(
+    Queue& queue, std::string& tag, MessageListener* listener, 
+    int ackMode, bool noLocal, bool synch, const FieldTable* fields)
+{
     string q = queue.getName();
-    AMQFrame* frame = new AMQFrame(id, new BasicConsumeBody(version, 0, q, (string&) tag, noLocal, ackMode == NO_ACK, false, !synch));
+    AMQFrame* frame =
+        new AMQFrame(
+            id,
+            new BasicConsumeBody(
+                version, 0, q, tag, noLocal, ackMode == NO_ACK, false, !synch,
+                fields ? *fields : FieldTable()));
     if(synch){
         sendAndReceive(frame, method_bodies.basic_consume_ok);
         BasicConsumeOkBody::shared_ptr response = dynamic_pointer_cast<BasicConsumeOkBody, AMQMethodBody>(responses.getResponse());