1 files changed, 10 insertions, 5 deletions
diff --git a/cpp/src/qpid/client/LocalQueue.h b/cpp/src/qpid/client/LocalQueue.h
index 048b4c7b4d..1c910bd3ee 100644
--- a/cpp/src/qpid/client/LocalQueue.h
+++ b/cpp/src/qpid/client/LocalQueue.h
@@ -23,8 +23,8 @@
  */
 
 #include "qpid/client/Message.h"
-#include "qpid/Exception.h"
-#include "qpid/sys/BlockingQueue.h"
+#include "qpid/client/Demux.h"
+#include "qpid/client/AckPolicy.h"
 
 namespace qpid {
 namespace client {
@@ -35,16 +35,21 @@ namespace client {
 class LocalQueue
 {
   public:
-    LocalQueue(BlockingQueue& q) : queue(q) {}
+    LocalQueue(AckPolicy=AckPolicy());
     ~LocalQueue();
 
     /** Pop the next message off the queue.
      *@exception ClosedException if subscription has been closed.
      */
-    Message pop() { reurn queue->pop(); }
+    Message pop();
+
+    void setAckPolicy(AckPolicy);
 
   private:
-    BlockingQueue& queue;
+  friend class SubscriptionManager;
+    Session_0_10 session;
+    Demux::QueuePtr queue;
+    AckPolicy autoAck;
 };
 
 }} // namespace qpid::client