Avoid a weird gcc warning when compiling with optimizations.

[software/eventxx.git] / test / mixed-way.cpp

diff --git a/test/mixed-way.cpp b/test/mixed-way.cpp
index d9517a22f3d4f71ef0b5fc00cd3efd8f0caed514..daea2e67a85128de8d0da0e8857fc6824dd81011 100644 (file)
--- a/test/mixed-way.cpp
+++ b/test/mixed-way.cpp
@@ -2,14 +2,12 @@
 #include <iostream>
 #include <csignal>
 
 #include <iostream>
 #include <csignal>
 

-using eventxx::dispatcher;
-

 struct handler
 {
 struct handler
 {

-       dispatcher& d;
+       eventxx::dispatcher& d;

        int i;
        int i;

-       handler(dispatcher& d): d(d), i(0) {}
-       void operator() (int signum, short event)
+       handler(eventxx::dispatcher& d): d(d), i(0) {}
+       void operator() (int signum, eventxx::type event)

        {
                if (i < 5) std::cout << "keep going...\n";
                else
        {
                if (i < 5) std::cout << "keep going...\n";
                else


@@ -28,7 +26,7 @@ void sighandler(int signum, short event, void* data)
 
 int main()
 {
 
 int main()
 {

-       dispatcher d;
+       eventxx::dispatcher d;

        handler h(d);
        eventxx::csignal sigev(SIGINT, sighandler, &h.i);
        eventxx::signal< handler > e(SIGINT, h);
        handler h(d);
        eventxx::csignal sigev(SIGINT, sighandler, &h.i);
        eventxx::signal< handler > e(SIGINT, h);