Misc. cleanup.

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

4 files changed, 9 insertions, 7 deletions

diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 7b5f9e3e32..0456b9f133 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -30,15 +30,15 @@ Broker::Broker(const Configuration& config) :
 { }
 
 
-Broker::SharedPtr Broker::create(int16_t port) 
+Broker::shared_ptr Broker::create(int16_t port) 
 {
     Configuration config;
     config.setPort(port);
     return create(config);
 }
 
-Broker::SharedPtr Broker::create(const Configuration& config) {
-    return Broker::SharedPtr(new Broker(config));
+Broker::shared_ptr Broker::create(const Configuration& config) {
+    return Broker::shared_ptr(new Broker(config));
 }    
         
 void Broker::run() {
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
index dd87c47909..55ae17571a 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/cpp/src/qpid/broker/Broker.h
@@ -42,12 +42,12 @@ namespace qpid {
              * Create a broker.
              * @param port Port to listen on or 0 to pick a port dynamically.
              */
-            static SharedPtr create(int16_t port = DEFAULT_PORT);
+            static shared_ptr create(int16_t port = DEFAULT_PORT);
 
             /**
              * Create a broker using a Configuration.
              */
-            static SharedPtr create(const Configuration& config);
+            static shared_ptr create(const Configuration& config);
 
             /**
              * Return listening port. If called before bind this is
@@ -68,7 +68,7 @@ namespace qpid {
 
           private:
             Broker(const Configuration& config); 
-            qpid::io::Acceptor::SharedPtr acceptor;
+            qpid::io::Acceptor::shared_ptr acceptor;
             SessionHandlerFactoryImpl factory;
         };
     }
diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
index b98f70ef68..9883c94a25 100644
--- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
+++ b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
@@ -19,6 +19,7 @@
 #include "qpid/broker/SessionHandlerImpl.h"
 #include "qpid/broker/FanOutExchange.h"
 #include "qpid/broker/HeadersExchange.h"
+#include "qpid/broker/DirectExchange.h"
 
 using namespace qpid::broker;
 using namespace qpid::io;
diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
index 25b4c0c13a..5bad81412b 100644
--- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
+++ b/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
@@ -20,11 +20,12 @@
 
 #include "qpid/framing/AMQFrame.h"
 #include "qpid/broker/AutoDelete.h"
-#include "qpid/broker/DirectExchange.h"
 #include "qpid/broker/ExchangeRegistry.h"
 #include "qpid/framing/ProtocolInitiation.h"
 #include "qpid/broker/QueueRegistry.h"
 #include "qpid/io/SessionHandlerFactory.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandler.h"
 #include "qpid/io/TimeoutHandler.h"
 
 namespace qpid {