Merge from trunk tag to-cmake-25mar09 (r758432)

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

1 files changed, 4 insertions, 3 deletions

diff --git a/qpid/cpp/src/tests/QueueEvents.cpp b/qpid/cpp/src/tests/QueueEvents.cpp
index 3e377d04b3..cd9439355e 100644
--- a/qpid/cpp/src/tests/QueueEvents.cpp
+++ b/qpid/cpp/src/tests/QueueEvents.cpp
@@ -27,6 +27,7 @@
 #include "qpid/broker/QueueEvents.h"
 #include "qpid/client/QueueOptions.h"
 #include "qpid/framing/SequenceNumber.h"
+#include "qpid/sys/Dispatcher.h"
 #include <boost/bind.hpp>
 #include <boost/format.hpp>
 
@@ -37,7 +38,7 @@ using namespace qpid::broker;
 using namespace qpid::sys;
 using qpid::framing::SequenceNumber;
 
-struct DummyListener
+struct EventChecker
 {
     typedef std::deque<QueueEvents::Event> Events;
 
@@ -70,9 +71,9 @@ QPID_AUTO_TEST_CASE(testBasicEventProcessing)
     sys::Dispatcher dispatcher(poller);
     Thread dispatchThread(dispatcher);
     QueueEvents events(poller);
-    DummyListener listener;
+    EventChecker listener;
     listener.poller = poller;
-    events.registerListener("dummy", boost::bind(&DummyListener::handle, &listener, _1));
+    events.registerListener("dummy", boost::bind(&EventChecker::handle, &listener, _1));
     //signal occurence of some events:
     Queue queue("queue1");
     SequenceNumber id;