Move ccallback declaration into the Events group.

[software/eventxx.git] / eventxx

diff --git a/eventxx b/eventxx
index 94ee1136911125e230063e9eabc3848a0f38fc9b..e2cf81f39b89dd8900f3dbcf457e3bd643ddf22d 100644 (file)
--- a/eventxx
+++ b/eventxx
@@ -319,10 +319,6 @@ enum
 };
 
 
-/// C function used as callback in the C API.
-typedef void (*ccallback_type)(int, short, void*);
-
-
 /**
  * Time used for timeout values.
  *
@@ -390,6 +386,11 @@ struct time: ::timeval
  */
 //@{
 
+
+/// C function used as callback in the C API.
+typedef void (*ccallback_type)(int, short, void*);
+
+
 /**
  * Type of events.
  *
@@ -410,6 +411,13 @@ enum type
        PERSIST = EV_PERSIST  ///< Not really an event, is an event modifier.
 };
 
+type operator| (const type& t1, const type& t2)
+{
+       int r = t1 | t2;
+       return *reinterpret_cast< type* >(&r);
+}
+
+
 /**
  * Basic event from which all events derive.
  *