Fix to build on latest corosync versions.

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

2 files changed, 14 insertions, 14 deletions

diff --git a/qpid/cpp/src/qpid/cluster/Cpg.cpp b/qpid/cpp/src/qpid/cluster/Cpg.cpp
index 48c3b483f9..3b7e82a751 100644
--- a/qpid/cpp/src/qpid/cluster/Cpg.cpp
+++ b/qpid/cpp/src/qpid/cluster/Cpg.cpp
@@ -126,8 +126,16 @@ void Cpg::shutdown() {
     }
 }
 
-void Cpg::dispatch(cpg_dispatch_t type) {
-    check(cpg_dispatch(handle,type), "Error in CPG dispatch");
+void Cpg::dispatchOne() {
+    check(cpg_dispatch(handle,CPG_DISPATCH_ONE), "Error in CPG dispatch");
+}
+
+void Cpg::dispatchAll() {
+    check(cpg_dispatch(handle,CPG_DISPATCH_ALL), "Error in CPG dispatch");
+}
+
+void Cpg::dispatchBlocking() {
+    check(cpg_dispatch(handle,CPG_DISPATCH_BLOCKING), "Error in CPG dispatch");
 }
 
 string Cpg::errorStr(cpg_error_t err, const std::string& msg) {
@@ -135,7 +143,7 @@ string Cpg::errorStr(cpg_error_t err, const std::string& msg) {
       case CPG_OK: return msg+": ok";
       case CPG_ERR_LIBRARY: return msg+": library error";
       case CPG_ERR_TIMEOUT: return msg+": timeout";
-      case CPG_ERR_TRY_AGAIN: return msg+": timeout. The aisexec daemon may not be running";
+      case CPG_ERR_TRY_AGAIN: return msg+": timeout.";
       case CPG_ERR_INVALID_PARAM: return msg+": invalid param";
       case CPG_ERR_NO_MEMORY: return msg+": no memory";
       case CPG_ERR_BAD_HANDLE: return msg+": bad handle";
diff --git a/qpid/cpp/src/qpid/cluster/Cpg.h b/qpid/cpp/src/qpid/cluster/Cpg.h
index 5de2b516d5..5ac5a5bdbc 100644
--- a/qpid/cpp/src/qpid/cluster/Cpg.h
+++ b/qpid/cpp/src/qpid/cluster/Cpg.h
@@ -94,17 +94,9 @@ class Cpg : public sys::IOHandle {
     /** Disconnect from CPG */
     void shutdown();
     
-    /** Dispatch CPG events.
-     *@param type one of
-     * - CPG_DISPATCH_ONE - dispatch exactly one event.
-     * - CPG_DISPATCH_ALL - dispatch all available events, don't wait.
-     * - CPG_DISPATCH_BLOCKING - blocking dispatch loop.
-     */
-    void dispatch(cpg_dispatch_t type);
-
-    void dispatchOne() { dispatch(CPG_DISPATCH_ONE); }
-    void dispatchAll() { dispatch(CPG_DISPATCH_ALL); }
-    void dispatchBlocking() { dispatch(CPG_DISPATCH_BLOCKING); }
+    void dispatchOne();
+    void dispatchAll();
+    void dispatchBlocking();
 
     void join(const std::string& group);    
     void leave();