Fixed the main documentation example which was *WRONG*.

libevent don't support multiple callbacks for the same event, so the main
example presented in eventxx documentation was wrong.

Thanks Jason Novak for reporting the problem.

diff --git a/README b/README
index 380ecfb4ab22da03364228ba31fa8d66b13e0fed..dbc5a6ade4f8b71672f19099469425829373a6a2 100644 (file)
--- a/README
+++ b/README
@@ -92,6 +92,7 @@ struct handler
        handler(eventxx::dispatcher& d): d(d), i(0) {}
        void operator() (int signum, eventxx::type event)
        {
+               std::cout << ++i << " interrupts, ";
                if (i < 5) std::cout << "keep going...\n";
                else
                {
@@ -101,19 +102,18 @@ struct handler
        }
 };
 
-void sighandler(int signum, short event, void* data)
+void timer_handler(int, short, void*)
 {
-       int& i = *static_cast< int* >(data);
-       std::cout << ++i << " interrupts, ";
+       std::cout << "Press Ctrl-C 5 times to quit.\n";
 }
 
 int main()
 {
        eventxx::dispatcher d;
        handler h(d);
-       eventxx::csignal sigev(SIGINT, sighandler, &h.i);
+       eventxx::ctimer t(timer_handler);
        eventxx::signal< handler > e(SIGINT, h);
-       d.add(sigev);
+       d.add(t, eventxx::time(1)); // 1 second
        d.add(e);
        d.dispatch();
        return 0;

diff --git a/test/mixed-way.cpp b/test/mixed-way.cpp
index daea2e67a85128de8d0da0e8857fc6824dd81011..f3238b2ddc0ca4df2c3baf7ea43a231eeba7dd6b 100644 (file)
--- a/test/mixed-way.cpp
+++ b/test/mixed-way.cpp
@@ -9,6 +9,7 @@ struct handler
        handler(eventxx::dispatcher& d): d(d), i(0) {}
        void operator() (int signum, eventxx::type event)
        {
+               std::cout << ++i << " interrupts, ";
                if (i < 5) std::cout << "keep going...\n";
                else
                {
@@ -18,19 +19,18 @@ struct handler
        }
 };
 
-void sighandler(int signum, short event, void* data)
+void timer_handler(int, short, void*)
 {
-       int& i = *static_cast< int* >(data);
-       std::cout << ++i << " interrupts, ";
+       std::cout << "Press Ctrl-C 5 times to quit.\n";
 }
 
 int main()
 {
        eventxx::dispatcher d;
        handler h(d);
-       eventxx::csignal sigev(SIGINT, sighandler, &h.i);
+       eventxx::ctimer t(timer_handler);
        eventxx::signal< handler > e(SIGINT, h);
-       d.add(sigev);
+       d.add(t, eventxx::time(1)); // 1 second
        d.add(e);
        d.dispatch();
        return 0;