Added ClusterMap and test. Moved PollableCondition, PollableQueue to sys.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/qpid/cluster/Event.cpp b/cpp/src/qpid/cluster/Event.cpp
index 4dfb7ab400..89c6268d7f 100644
--- a/cpp/src/qpid/cluster/Event.cpp
+++ b/cpp/src/qpid/cluster/Event.cpp
@@ -34,7 +34,7 @@ using framing::Buffer;
 const size_t Event::OVERHEAD = sizeof(uint8_t) + sizeof(uint64_t);
 
 Event::Event(EventType t, const ConnectionId c, const size_t s)
-    : type(t), connection(c), size(s), data(RefCountedBuffer::create(s)) {}
+    : type(t), connectionId(c), size(s), data(RefCountedBuffer::create(s)) {}
 
 Event Event::delivered(const MemberId& m, void* d, size_t s) {
     Buffer buf(static_cast<char*>(d), s);
@@ -50,7 +50,7 @@ void Event::mcast (const Cpg::Name& name, Cpg& cpg) const {
     char header[OVERHEAD];
     Buffer b(header, OVERHEAD);
     b.putOctet(type);
-    b.putLongLong(reinterpret_cast<uint64_t>(connection.getConnectionPtr()));
+    b.putLongLong(reinterpret_cast<uint64_t>(connectionId.getConnectionPtr()));
     iovec iov[] = { { header, OVERHEAD }, { const_cast<char*>(getData()), getSize() } };
     cpg.mcast(name, iov, sizeof(iov)/sizeof(*iov));
 }
@@ -61,7 +61,7 @@ Event::operator Buffer() const  {
 
 static const char* EVENT_TYPE_NAMES[] = { "data", "control" };
 std::ostream& operator << (std::ostream& o, const Event& e) {
-    o << "[event: " << e.getConnection()
+    o << "[event: " << e.getConnectionId()
       << " " << EVENT_TYPE_NAMES[e.getType()]
       << " " << e.getSize() << " bytes: ";
     std::ostream_iterator<char> oi(o,"");