From 51e77c8bc7dc4d71422b421135ded1cb33bb5c55 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 12 Nov 2009 10:30:53 +0000 Subject: Merge branch 'next_receiver_changes' into trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@835323 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/messaging/Session.cpp | 17 ++++++++++++----- cpp/src/qpid/messaging/SessionImpl.h | 3 ++- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'cpp/src/qpid/messaging') diff --git a/cpp/src/qpid/messaging/Session.cpp b/cpp/src/qpid/messaging/Session.cpp index b69b575b26..aa8e067168 100644 --- a/cpp/src/qpid/messaging/Session.cpp +++ b/cpp/src/qpid/messaging/Session.cpp @@ -65,11 +65,6 @@ Receiver Session::createReceiver(const std::string& address) return impl->createReceiver(Address(address)); } -Address Session::createTempQueue(const std::string& baseName) -{ - return impl->createTempQueue(baseName); -} - void Session::sync() { impl->sync(); @@ -94,6 +89,18 @@ bool Session::dispatch(qpid::sys::Duration timeout) { return impl->dispatch(timeout); } + +bool Session::nextReceiver(Receiver& receiver, qpid::sys::Duration timeout) +{ + return impl->nextReceiver(receiver, timeout); +} + + +Receiver Session::nextReceiver(qpid::sys::Duration timeout) +{ + return impl->nextReceiver(timeout); +} + uint32_t Session::available() { return impl->available(); } uint32_t Session::pendingAck() { return impl->pendingAck(); } diff --git a/cpp/src/qpid/messaging/SessionImpl.h b/cpp/src/qpid/messaging/SessionImpl.h index e48e7a4d02..cf95e22ae8 100644 --- a/cpp/src/qpid/messaging/SessionImpl.h +++ b/cpp/src/qpid/messaging/SessionImpl.h @@ -51,9 +51,10 @@ class SessionImpl : public virtual qpid::RefCounted virtual bool fetch(Message& message, qpid::sys::Duration timeout) = 0; virtual Message fetch(qpid::sys::Duration timeout) = 0; virtual bool dispatch(qpid::sys::Duration timeout) = 0; - virtual Address createTempQueue(const std::string& baseName) = 0; virtual Sender createSender(const Address& address) = 0; virtual Receiver createReceiver(const Address& address) = 0; + virtual bool nextReceiver(Receiver& receiver, qpid::sys::Duration timeout) = 0; + virtual Receiver nextReceiver(qpid::sys::Duration timeout) = 0; virtual uint32_t available() = 0; virtual uint32_t pendingAck() = 0; private: -- cgit v1.2.1