QPID-3921: Refactored Broker::Options into its own independent class

- Now called BrokerOptions
- Added extra getters to Broker so that nothing else needs to know
  about BrokerOptions
- Significantly reduces header coupling as lots of files include
  Broker.h, but now don't need Options.h

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

1 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/tests/ClientSessionTest.cpp b/cpp/src/tests/ClientSessionTest.cpp
index 2236882eed..6cd63e7f04 100644
--- a/cpp/src/tests/ClientSessionTest.cpp
+++ b/cpp/src/tests/ClientSessionTest.cpp
@@ -52,7 +52,7 @@ using namespace qpid;
 using qpid::sys::Monitor;
 using qpid::sys::Thread;
 using qpid::sys::TIME_SEC;
-using qpid::broker::Broker;
+using qpid::broker::BrokerOptions;
 using std::string;
 using std::cout;
 using std::endl;
@@ -105,7 +105,7 @@ struct SimpleListener : public MessageListener
 
 struct ClientSessionFixture : public SessionFixture
 {
-    ClientSessionFixture(Broker::Options opts = Broker::Options()) : SessionFixture(opts) {
+    ClientSessionFixture(BrokerOptions opts = BrokerOptions()) : SessionFixture(opts) {
         session.queueDeclare(arg::queue="my-queue");
     }
 };
@@ -248,7 +248,7 @@ QPID_AUTO_TEST_CASE(testOpenFailure) {
 }
 
 QPID_AUTO_TEST_CASE(testPeriodicExpiration) {
-    Broker::Options opts;
+    BrokerOptions opts;
     opts.queueCleanInterval = 1*TIME_SEC;
     opts.queueFlowStopRatio = 0;
     opts.queueFlowResumeRatio = 0;