Some small changes which clean up header file inclusions

and generally start to tidy up the network layer so that it's
a bit easier to implement new network transports


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

1 files changed, 3 insertions, 2 deletions

diff --git a/cpp/src/qpid/client/ConnectionImpl.h b/cpp/src/qpid/client/ConnectionImpl.h
index b02dda5af7..98fb212c3e 100644
--- a/cpp/src/qpid/client/ConnectionImpl.h
+++ b/cpp/src/qpid/client/ConnectionImpl.h
@@ -24,7 +24,6 @@
 
 #include "Bounds.h"
 #include "ConnectionHandler.h"
-#include "Connector.h"
 #include "qpid/framing/FrameHandler.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/ShutdownHandler.h"
@@ -33,11 +32,13 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
 namespace qpid {
 namespace client {
 
+class Connector;
 class ConnectionSettings;
 class SessionImpl;
 
@@ -52,7 +53,7 @@ class ConnectionImpl : public Bounds,
 
     SessionMap sessions; 
     ConnectionHandler handler;
-    Connector connector;
+    boost::scoped_ptr<Connector> connector;
     framing::ProtocolVersion version;
     sys::Mutex lock;
     bool isClosed;