summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/qpid/broker/Queue.h
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2014-04-07 21:22:32 +0000
committerAlan Conway <aconway@apache.org>2014-04-07 21:22:32 +0000
commit8ea0f79d78edd0a0825547ecc618e3fa63a2b93f (patch)
tree1351b13a08a8827f6d64dac1b2700efa93343e56 /qpid/cpp/src/qpid/broker/Queue.h
parent8b0808b498dd5e3fe5e5d04e9e9c9492206036e2 (diff)
downloadqpid-python-8ea0f79d78edd0a0825547ecc618e3fa63a2b93f.tar.gz
QPID-5667: C++ broker: QMF subscribe events are not raised with AMQP 1.0
The raise event logic for subscribe/unsubscribe events was in 0-10 specific code. Moved it into Queue.cpp so events are generated regardless of protocol. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585587 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/broker/Queue.h')
-rw-r--r--qpid/cpp/src/qpid/broker/Queue.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
index 21a8b7ef99..683468e9a4 100644
--- a/qpid/cpp/src/qpid/broker/Queue.h
+++ b/qpid/cpp/src/qpid/broker/Queue.h
@@ -348,8 +348,14 @@ class Queue : public boost::enable_shared_from_this<Queue>,
QPID_BROKER_EXTERN void recover(Message& msg);
QPID_BROKER_EXTERN void consume(Consumer::shared_ptr c,
- bool exclusive = false);
- QPID_BROKER_EXTERN void cancel(Consumer::shared_ptr c);
+ bool exclusive = false,
+ const framing::FieldTable& arguments = framing::FieldTable(),
+ const std::string& connectionId=std::string(),
+ const std::string& userId=std::string());
+
+ QPID_BROKER_EXTERN void cancel(Consumer::shared_ptr c,
+ const std::string& connectionId=std::string(),
+ const std::string& userId=std::string());
/**
* Used to indicate that the queue is being used in some other
* context than by a subscriber. The controlling flag should only