Reverted move of ConnectionOptions (without the parse functionality they aren't off much use).

Corrected include in ConnectionOptions.h



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

4 files changed, 5 insertions, 9 deletions

diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index bb0df2aa2d..53b828a709 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -443,7 +443,6 @@ nobase_include_HEADERS = \
   qpid/client/ConnectionHandler.h \
   qpid/client/ConnectionImpl.h \
   qpid/client/ConnectionSettings.h \
-  qpid/client/ConnectionOptions.h \
   qpid/client/Connector.h \
   qpid/client/ChainableFrameHandler.h	\
   qpid/client/Demux.h \
diff --git a/qpid/cpp/src/qpid/client/ConnectionOptions.h b/qpid/cpp/src/tests/ConnectionOptions.h
index b997b21494..b4b562fbb9 100644
--- a/qpid/cpp/src/qpid/client/ConnectionOptions.h
+++ b/qpid/cpp/src/tests/ConnectionOptions.h
@@ -22,11 +22,9 @@
  *
  */
 
-#include "qpid/Options.h"
 #include "qpid/client/ConnectionSettings.h"
+#include "qpid/Options.h"
 
-namespace qpid {
-namespace client {
 /**
  * Options parser for ConnectionOptions.
  */
@@ -52,6 +50,4 @@ struct  ConnectionOptions : public qpid::Options,
     }
 };
 
-}}
-
 #endif  /*!QPID_CLIENT_CONNECTIONOPTIONS_H*/
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index 41e7c525cf..1751d26808 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -63,7 +63,8 @@ unit_test_SOURCES= unit_test.cpp unit_test.h \
 	TxAckTest.cpp \
 	TxBufferTest.cpp \
 	TxPublishTest.cpp \
-	MessageBuilderTest.cpp
+	MessageBuilderTest.cpp \
+	ConnectionOptions.h
 
 if HAVE_XML
 unit_test_SOURCES+= XmlClientSessionTest.cpp
diff --git a/qpid/cpp/src/tests/TestOptions.h b/qpid/cpp/src/tests/TestOptions.h
index 365db59637..a400fe5ecb 100644
--- a/qpid/cpp/src/tests/TestOptions.h
+++ b/qpid/cpp/src/tests/TestOptions.h
@@ -26,7 +26,7 @@
 #include "qpid/Url.h"
 #include "qpid/log/Logger.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ConnectionOptions.h"
+#include "ConnectionOptions.h"
 
 #include <iostream>
 #include <exception>
@@ -69,7 +69,7 @@ struct TestOptions : public qpid::Options
 
     
     bool help;
-    qpid::client::ConnectionOptions con;
+    ConnectionOptions con;
     qpid::log::Options log;
     std::string helpText;
 };