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

1 files changed, 12 insertions, 5 deletions

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(); }