- use flock to lock data dir rather than a lock file.

 - removed troublesome global constructor in Mutex initialization.


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

1 files changed, 10 insertions, 10 deletions

diff --git a/cpp/src/qpid/cluster/Cpg.h b/cpp/src/qpid/cluster/Cpg.h
index 2a7ec459d3..1ed362f94e 100644
--- a/cpp/src/qpid/cluster/Cpg.h
+++ b/cpp/src/qpid/cluster/Cpg.h
@@ -149,19 +149,19 @@ class Cpg : public Dispatchable {
     }
 
     static void globalDeliver(
-        cpg_handle_t /*handle*/,
+        cpg_handle_t handle,
         struct cpg_name *group,
-        uint32_t /*nodeid*/,
-        uint32_t /*pid*/,
-        void* /*msg*/,
-        int /*msg_len*/);
+        uint32_t nodeid,
+        uint32_t pid,
+        void* msg,
+        int msg_len);
 
     static void globalConfigChange(
-        cpg_handle_t /*handle*/,
-        struct cpg_name */*group*/,
-        struct cpg_address */*members*/, int /*nMembers*/,
-        struct cpg_address */*left*/, int /*nLeft*/,
-        struct cpg_address */*joined*/, int /*nJoined*/
+        cpg_handle_t handle,
+        struct cpg_name *group,
+        struct cpg_address *members, int nMembers,
+        struct cpg_address *left, int nLeft,
+        struct cpg_address *joined, int nJoined
     );
 
     static Handles handles;