Consistence fix about eventxx::type vs. short.

It wasn't very clear when to use short and when to use eventxx::type. Now it's
clear. Everything use eventxx::type excepto C-like callbacks, which expects a
short.

diff --git a/eventxx b/eventxx
index e2cf81f39b89dd8900f3dbcf457e3bd643ddf22d..d599f6472f7350322042e7845845aa845f7f3757 100644 (file)
--- a/eventxx
+++ b/eventxx
@@ -94,7 +94,7 @@
  *     eventxx::dispatcher& d;
  *     int i;
  *     handler(eventxx::dispatcher& d): d(d), i(0) {}
- *     void operator() (int signum, short event)
+ *     void operator() (int signum, eventxx::type event)
  *     {
  *             if (i < 5) std::cout << "keep going...\n";
  *             else
@@ -378,6 +378,9 @@ struct time: ::timeval
  * A member function wrapper functor (eventxx::mem_cb) is also included,
  * so you can use any member function (method) as an event handler.
  *
+ * Please note that C-like function callback take a short as the type of event,
+ * while functors (or member functions) use eventxx::type.
+ *
  * All events derive from a plain class (not template) eventxx::basic_event, one
  * of the main utilities of it (besides containing common code ;) is to be used
  * in STL containers.
@@ -520,9 +523,9 @@ struct event: basic_event
         * @param ev Type of events to monitor (see eventxx::type).
         * @param handler Callback functor.
         */
-       event(int fd, short ev, F& handler) throw()
+       event(int fd, type ev, F& handler) throw()
        {
-               event_set(this, fd, ev, &wrapper,
+               event_set(this, fd, static_cast< short >(ev), &wrapper,
                                reinterpret_cast< void* >(&handler));
        }
 
@@ -556,9 +559,9 @@ struct event< ccallback_type >: basic_event
         * @param handler C-style callback function.
         * @param arg Arbitrary pointer to pass to the handler as argument.
         */
-       event(int fd, short ev, ccallback_type handler, void* arg = 0) throw()
+       event(int fd, type ev, ccallback_type handler, void* arg = 0) throw()
        {
-               event_set(this, fd, ev, handler, arg);
+               event_set(this, fd, static_cast< short >(ev), handler, arg);
        }
 
        protected:
@@ -719,6 +722,7 @@ typedef eventxx::signal< ccallback_type > csignal;
 template < typename O, typename M >
 struct mem_cb
 {
+
        /**
         * Member function callback constructor.
         *
@@ -733,10 +737,12 @@ struct mem_cb
         */
        mem_cb(O& object, M method) throw():
                _object(object), _method(method) {}
-       void operator() (int fd, short ev) { (_object.*_method)(fd, ev); }
+
+       void operator() (int fd, type ev) { (_object.*_method)(fd, ev); }
        protected:
                O& _object;
                M _method;
+
 }; // struct mem_cb
 
 //@}
@@ -846,8 +852,9 @@ struct dispatcher
        template < typename F >
        void add_once(int fd, type ev, F& handler)
        {
-               internal::event_once(fd, ev, &dispatcher::wrapper< F >,
-                               reinterpret_cast< void* >(&handler), 0);
+               internal::event_once(fd, static_cast< short>(ev),
+                       &dispatcher::wrapper< F >,
+                       reinterpret_cast< void* >(&handler), 0);
        }
 
        /**
@@ -863,7 +870,8 @@ struct dispatcher
         */
        void add_once(int fd, type ev, ccallback_type handler, void* arg)
        {
-               internal::event_once(fd, ev, handler, arg, 0);
+               internal::event_once(fd, static_cast< short >(ev), handler,
+                       arg, 0);
        }
 
        /**
@@ -880,10 +888,11 @@ struct dispatcher
        template < typename F >
        void add_once(int fd, type ev, F& handler, const time& to)
        {
-               internal::event_once(fd, ev, &dispatcher::wrapper< F >,
-                               reinterpret_cast< void* >(&handler),
-                               // XXX HACK libevent don't use const
-                               const_cast< time* >(&to));
+               internal::event_once(fd, static_cast< short >(ev),
+                       &dispatcher::wrapper< F >,
+                       reinterpret_cast< void* >(&handler),
+                       // XXX HACK libevent don't use const
+                       const_cast< time* >(&to));
        }
 
        /**
@@ -901,7 +910,7 @@ struct dispatcher
        void add_once(int fd, type ev, ccallback_type handler, void* arg,
                        const time& to)
        {
-               internal::event_once(fd, ev, handler, arg,
+               internal::event_once(fd, static_cast< short >(ev), handler, arg,
                                // XXX HACK libevent don't use const
                                const_cast< time* >(&to));
        }

diff --git a/test/functor-way.cpp b/test/functor-way.cpp
index b9f3b775bb270938cacf944a659542d2ea2e9d84..5a58af3079cd7e3ec85345e7b49ea44980cadd87 100644 (file)
--- a/test/functor-way.cpp
+++ b/test/functor-way.cpp
@@ -9,7 +9,7 @@ struct handler
        dispatcher& d;
        int i;
        handler(dispatcher& d): d(d), i(0) {}
-       void operator() (int signum, short event)
+       void operator() (int signum, eventxx::type event)
        {
                std::cout << ++i << " interrupts, ";
                if (i < 5) std::cout << "keep going...\n";

diff --git a/test/mixed-way.cpp b/test/mixed-way.cpp
index 02dfabc34103fee54e8df5cd4cfbe6015a5f9ffc..daea2e67a85128de8d0da0e8857fc6824dd81011 100644 (file)
--- a/test/mixed-way.cpp
+++ b/test/mixed-way.cpp
@@ -7,7 +7,7 @@ struct handler
        eventxx::dispatcher& d;
        int i;
        handler(eventxx::dispatcher& d): d(d), i(0) {}
-       void operator() (int signum, short event)
+       void operator() (int signum, eventxx::type event)
        {
                if (i < 5) std::cout << "keep going...\n";
                else

diff --git a/test/test-eof.cpp b/test/test-eof.cpp
index 9f6220f18094662638b8eb62753325113b474a2e..4b30013783915b1cb8a51badc577afc4ea11dc35 100644 (file)
--- a/test/test-eof.cpp
+++ b/test/test-eof.cpp
@@ -60,7 +60,7 @@ main (int argc, char **argv)
        shutdown(pair[0], SHUT_WR);
 
        /* Initalize one event */
-       ev = new eventxx::cevent(pair[1], EV_READ, read_cb, NULL);
+       ev = new eventxx::cevent(pair[1], eventxx::READ, read_cb, NULL);
 
        d.add(*ev);
 

diff --git a/test/test-weof.cpp b/test/test-weof.cpp
index b40a487390ee59c9154465713d879f20d8190ab4..ffe0a8885d62149c4d628dedfd161f8df5889e7d 100644 (file)
--- a/test/test-weof.cpp
+++ b/test/test-weof.cpp
@@ -61,7 +61,7 @@ main (int argc, char **argv)
                return (1);
 
        /* Initalize one event */
-       ev = new eventxx::event< cb_t >(pair[1], EV_WRITE, write_cb);
+       ev = new eventxx::event< cb_t >(pair[1], eventxx::WRITE, write_cb);
 
        d.add(*ev);
 

diff --git a/test/wrapped-functor-way.cpp b/test/wrapped-functor-way.cpp
index 9664b8ad700a75f2c7a6e464741f072ee64180aa..4c85a6dff19ee895dffbc126b0d4cb2d16588b8a 100644 (file)
--- a/test/wrapped-functor-way.cpp
+++ b/test/wrapped-functor-way.cpp
@@ -9,7 +9,7 @@ struct handler
        dispatcher& d;
        int i;
        handler(dispatcher& d): d(d), i(0) {}
-       void handle_event(int signum, short event)
+       void handle_event(int signum, eventxx::type event)
        {
                std::cout << ++i << " interrupts, ";
                if (i < 5) std::cout << "keep going...\n";
@@ -21,7 +21,7 @@ struct handler
        }
 };
 
-typedef eventxx::mem_cb< handler, void (handler::*)(int, short) > cb_type;
+typedef eventxx::mem_cb< handler, void (handler::*)(int, eventxx::type) > cb_type;
 
 int main()
 {