Remove the using eventxx::dispatcher from the mixed test.

diff --git a/test/Makefile b/test/Makefile
index 4beddbfbb4112e004a7b51aa552ce050eac60a9b..be01b69798139124715916993e5b7299b617d45a 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,7 +2,7 @@
 CXXFLAGS=-I.. -g -Wall
 # Uncomment this if you have a fixed event_base_free().
 # See http://www.mail-archive.com/libevent-users@monkey.org/msg00112.html
-#CXXFLAGS+=-DEVENT_BASE_FREE_FIX
+CXXFLAGS+=-DEVENT_BASE_FREE_FIX
 LDFLAGS=-levent
 
 targets=bench test-eof test-time test-weof trivial c-way functor-way \

diff --git a/test/mixed-way.cpp b/test/mixed-way.cpp
index d9517a22f3d4f71ef0b5fc00cd3efd8f0caed514..02dfabc34103fee54e8df5cd4cfbe6015a5f9ffc 100644 (file)
--- a/test/mixed-way.cpp
+++ b/test/mixed-way.cpp
@@ -2,13 +2,11 @@
 #include <iostream>
 #include <csignal>
 
-using eventxx::dispatcher;
-
 struct handler
 {
-       dispatcher& d;
+       eventxx::dispatcher& d;
        int i;
-       handler(dispatcher& d): d(d), i(0) {}
+       handler(eventxx::dispatcher& d): d(d), i(0) {}
        void operator() (int signum, short event)
        {
                if (i < 5) std::cout << "keep going...\n";
@@ -28,7 +26,7 @@ void sighandler(int signum, short event, void* data)
 
 int main()
 {
-       dispatcher d;
+       eventxx::dispatcher d;
        handler h(d);
        eventxx::csignal sigev(SIGINT, sighandler, &h.i);
        eventxx::signal< handler > e(SIGINT, h);