qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r742602 - in /qpid/trunk/qpid/cpp/src/tests: ClusterFixture.cpp cluster_test.cpp
Date Mon, 09 Feb 2009 16:33:49 GMT
Author: aconway
Date: Mon Feb  9 16:33:48 2009
New Revision: 742602

URL: http://svn.apache.org/viewvc?rev=742602&view=rev
Log:
Fix doubly-defined function.

Modified:
    qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp
    qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp

Modified: qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp?rev=742602&r1=742601&r2=742602&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp Mon Feb  9 16:33:48 2009
@@ -60,18 +60,6 @@
 
 #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 @@
     }
 }
 
+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();

Modified: qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp?rev=742602&r1=742601&r2=742602&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp Mon Feb  9 16:33:48 2009
@@ -64,13 +64,6 @@
 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);



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message