From f53cc284b3045462d751084acf8311a96b4769b7 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 9 Feb 2009 16:33:48 +0000 Subject: Fix doubly-defined function. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@742602 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/ClusterFixture.cpp | 22 ++++++++++------------ cpp/src/tests/cluster_test.cpp | 7 ------- 2 files changed, 10 insertions(+), 19 deletions(-) (limited to 'cpp/src') diff --git a/cpp/src/tests/ClusterFixture.cpp b/cpp/src/tests/ClusterFixture.cpp index 7b89aa9b5d..76c7cd7e2b 100644 --- a/cpp/src/tests/ClusterFixture.cpp +++ b/cpp/src/tests/ClusterFixture.cpp @@ -60,18 +60,6 @@ using qpid::cluster::Cluster; #include "ClusterFixture.h" - -/** Parse broker & cluster options */ -Broker::Options parseOpts(size_t argc, const char* argv[]) { - Broker::Options opts; - Plugin::addOptions(opts); // Pick up cluster options. - opts.parse(argc, argv, "", true); // Allow-unknown for --load-module - return opts; -} - - - - ClusterFixture::ClusterFixture(size_t n, int localIndex_) : name(Uuid(true).str()), localIndex(localIndex_) { add(n); } @@ -97,6 +85,16 @@ void ClusterFixture::add() { } } +namespace { +/** Parse broker & cluster options */ +Broker::Options parseOpts(size_t argc, const char* argv[]) { + Broker::Options opts; + Plugin::addOptions(opts); // Pick up cluster options. + opts.parse(argc, argv, "", true); // Allow-unknown for --load-module + return opts; +} +} + void ClusterFixture::addLocal() { assert(int(size()) == localIndex || localIndex == -1); localIndex = size(); diff --git a/cpp/src/tests/cluster_test.cpp b/cpp/src/tests/cluster_test.cpp index 6ee42be194..15a96aeba9 100644 --- a/cpp/src/tests/cluster_test.cpp +++ b/cpp/src/tests/cluster_test.cpp @@ -64,13 +64,6 @@ using qpid::broker::Broker; using boost::shared_ptr; using qpid::cluster::Cluster; -/** Parse broker & cluster options */ -Broker::Options parseOpts(size_t argc, const char* argv[]) { - Broker::Options opts; - Plugin::addOptions(opts); // Pick up cluster options. - opts.parse(argc, argv, "", true); // Allow-unknown for --load-module - return opts; -} ostream& operator<<(ostream& o, const cpg_name* n) { return o << qpid::cluster::Cpg::str(*n); -- cgit v1.2.1