Fix --cluster-cman option to enable cman integration.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/cpp/src/qpid/cluster/Cluster.h b/cpp/src/qpid/cluster/Cluster.h
index aff3f18c6d..2a659be2f1 100644
--- a/cpp/src/qpid/cluster/Cluster.h
+++ b/cpp/src/qpid/cluster/Cluster.h
@@ -24,6 +24,7 @@
 #include "NoOpConnectionOutputHandler.h"
 #include "ClusterMap.h"
 #include "FailoverExchange.h"
+#include "Quorum.h"
 
 #include "qpid/broker/Broker.h"
 #include "qpid/sys/PollableQueue.h"
@@ -66,7 +67,7 @@ class Cluster : private Cpg::Handler, public management::Manageable {
      * @param name of the cluster.
      * @param url of this broker, sent to the cluster.
      */
-    Cluster(const std::string& name, const Url& url, broker::Broker&);
+    Cluster(const std::string& name, const Url& url, broker::Broker&, bool useQuorum);
 
     virtual ~Cluster();
 
@@ -176,7 +177,6 @@ class Cluster : private Cpg::Handler, public management::Manageable {
     void dumpOutDone(Lock&);
 
     void setClusterId(const framing::Uuid&);
-    static bool isQuorateImpl();
 
     mutable sys::Monitor lock;
 
@@ -215,6 +215,8 @@ class Cluster : private Cpg::Handler, public management::Manageable {
     size_t lastSize;
     boost::shared_ptr<FailoverExchange> failoverExchange;
 
+    Quorum quorum;
+
   friend std::ostream& operator<<(std::ostream&, const Cluster&);
   friend class ClusterDispatcher;
 };