Tidy up unnecessary includes in ConnectionSettings and fix consequences

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

2 files changed, 7 insertions, 9 deletions

diff --git a/qpid/cpp/include/qpid/client/Connection.h b/qpid/cpp/include/qpid/client/Connection.h
index 4d92d4b804..6ed0d98bc0 100644
--- a/qpid/cpp/include/qpid/client/Connection.h
+++ b/qpid/cpp/include/qpid/client/Connection.h
@@ -28,6 +28,8 @@
 #include "qpid/client/ConnectionSettings.h"
 #include "qpid/framing/ProtocolVersion.h"
 
+#include "boost/function.hpp"
+
 namespace qpid {
 
 struct Url;
diff --git a/qpid/cpp/include/qpid/client/ConnectionSettings.h b/qpid/cpp/include/qpid/client/ConnectionSettings.h
index 46053e1fa8..bf060e73bb 100644
--- a/qpid/cpp/include/qpid/client/ConnectionSettings.h
+++ b/qpid/cpp/include/qpid/client/ConnectionSettings.h
@@ -22,13 +22,9 @@
  *
  */
 
-#include "qpid/Options.h"
-#include "qpid/log/Options.h"
-#include "qpid/Url.h"
 #include "qpid/client/ClientImportExport.h"
-
-#include <iostream>
-#include <exception>
+#include "qpid/sys/IntegerTypes.h"
+#include <string>
 
 namespace qpid {
 
@@ -107,7 +103,7 @@ struct ConnectionSettings {
      * Limit the size of the connections send buffer . The buffer
      * is limited to bounds * maxFrameSize.
      */
-    uint bounds;
+    unsigned int bounds;
     /**
      * If true, TCP_NODELAY will be set for the connection.
      */
@@ -120,12 +116,12 @@ struct ConnectionSettings {
      * Minimum acceptable strength of any SASL negotiated security
      * layer. 0 means no security layer required.
      */
-    uint minSsf;
+    unsigned int minSsf;
     /**
      * Maximum acceptable strength of any SASL negotiated security
      * layer. 0 means no security layer allowed.
      */
-    uint maxSsf;
+    unsigned int maxSsf;
 };
 
 }} // namespace qpid::client