diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-08-04 19:04:43 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-08-04 19:04:43 +0000 |
| commit | 029f187976c84fdacd6ccc77e3aa008f94caf3b4 (patch) | |
| tree | 6c0613899a318c41566dea0dc7ca60a33d946106 /cpp/src/qpid/cluster/Cluster.cpp | |
| parent | 49cd5756e569ba71c39d3e11af81e41af0414b9c (diff) | |
| download | qpid-python-029f187976c84fdacd6ccc77e3aa008f94caf3b4.tar.gz | |
Fixes for cluster code to compile with new stricter corosync header files
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@800921 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/Cluster.cpp')
| -rw-r--r-- | cpp/src/qpid/cluster/Cluster.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index ca3a7fa257..5a0b3a3d5e 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/cpp/src/qpid/cluster/Cluster.cpp @@ -315,7 +315,7 @@ void Cluster::leave(Lock&) { // Deliver CPG message. void Cluster::deliver( cpg_handle_t /*handle*/, - cpg_name* /*group*/, + const cpg_name* /*group*/, uint32_t nodeid, uint32_t pid, void* msg, @@ -507,10 +507,10 @@ ostream& operator<<(ostream& o, const AddrList& a) { void Cluster::configChange ( cpg_handle_t /*handle*/, - cpg_name */*group*/, - cpg_address *current, int nCurrent, - cpg_address *left, int nLeft, - cpg_address */*joined*/, int /*nJoined*/) + const cpg_name */*group*/, + const cpg_address *current, int nCurrent, + const cpg_address *left, int nLeft, + const cpg_address */*joined*/, int /*nJoined*/) { Mutex::ScopedLock l(lock); if (state == INIT) { // First config change. @@ -521,7 +521,7 @@ void Cluster::configChange ( QPID_LOG(notice, *this << " membership change: " << AddrList(current, nCurrent) << AddrList(left, nLeft, "left: ")); std::string addresses; - for (cpg_address* p = current; p < current+nCurrent; ++p) + for (const cpg_address* p = current; p < current+nCurrent; ++p) addresses.append(MemberId(*p).str()); deliverEvent(Event::control(ClusterConfigChangeBody(ProtocolVersion(), addresses), self)); } |
