Start moving towards final 0-10 spec:

* marked preview spec as 99-0 to distinguish it from 0-10 (which will now be used for the final version)
* modified python client to treat 99-0 as 0-10 for now
* modified broker to have two paths for the two different versions: 99-0 uses PreviewConnection, PreviewConnectionHandler 
  and PreviewSessionHandler which are straight copy & pastes of the Connection, ConnectionHandler and SessionHandler now
  associated with 0-10 (so we can migrate the 0-10 path to the final spec without affecting clients working with the preview
  version)
 


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@629883 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 6 deletions

diff --git a/cpp/src/qpid/client/Dispatcher.h b/cpp/src/qpid/client/Dispatcher.h
index ae67e61299..e23d0c198c 100644
--- a/cpp/src/qpid/client/Dispatcher.h
+++ b/cpp/src/qpid/client/Dispatcher.h
@@ -25,6 +25,7 @@
 #include <memory>
 #include <string>
 #include <boost/shared_ptr.hpp>
+#include "qpid/client/Session.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/Runnable.h"
 #include "qpid/sys/Thread.h"
@@ -34,17 +35,15 @@
 namespace qpid {
 namespace client {
 
-class Session_0_10;
-
 class Subscriber : public MessageListener
 {
-    Session_0_10& session;
+    Session& session;
     MessageListener* const listener;
     AckPolicy autoAck;
 
 public:
     typedef boost::shared_ptr<Subscriber> shared_ptr;
-    Subscriber(Session_0_10& session, MessageListener* listener, AckPolicy);
+    Subscriber(Session& session, MessageListener* listener, AckPolicy);
     void received(Message& msg);
     
 };
@@ -56,7 +55,7 @@ class Dispatcher : public sys::Runnable
     typedef std::map<std::string, Subscriber::shared_ptr> Listeners;
     sys::Mutex lock;
     sys::Thread worker;
-    Session_0_10& session;
+    Session& session;
     Demux::QueuePtr queue;
     bool running;
     bool autoStop;
@@ -68,7 +67,7 @@ class Dispatcher : public sys::Runnable
     bool isStopped();
 
 public:
-    Dispatcher(Session_0_10& session, const std::string& queue = "");
+    Dispatcher(Session& session, const std::string& queue = "");
 
     void start();
     void run();