*** empty log message ***

[software/libev.git] / ev++.h

diff --git a/ev++.h b/ev++.h
index 604340e19d9e5a84f49dca6783478bfce2bd5abc..f5355151258e5ab0ba147a30673030c4fe5ce875 100644 (file)
--- a/ev++.h
+++ b/ev++.h
@@ -1,7 +1,11 @@
 #ifndef EVPP_H__
 #define EVPP_H__
 
-#include "ev.h"
+#ifdef EV_H
+# include EV_H
+#else
+# include <ev.h>
+#endif
 
 namespace ev {
 
@@ -28,6 +32,7 @@ namespace ev {
       ev_set_cb (static_cast<ev_watcher *>(this), cb);
     }
 
+    // method callback
     template<class K, void (K::*method)(watcher &w, int)>
     void set (K *object)
     {
@@ -41,6 +46,7 @@ namespace ev {
       (obj->*method) (*static_cast<watcher *>(w), revents);
     }
 
+    // const method callback
     template<class K, void (K::*method)(watcher &w, int) const>
     void set (const K *object)
     {
@@ -54,6 +60,7 @@ namespace ev {
       (static_cast<K *>(w->data)->*method) (*static_cast<watcher *>(w), revents);
     }
 
+    // function callback
     template<void (*function)(watcher &w, int)>
     void set (void *data = 0)
     {
@@ -66,6 +73,20 @@ namespace ev {
       function (*static_cast<watcher *>(w), revents);
     }
 
+    // simple callback
+    template<class K, void (K::*method)()>
+    void set (K *object)
+    {
+      set_ (object, method_noargs_thunk<K, method>);
+    }
+
+    template<class K, void (K::*method)()>
+    static void method_noargs_thunk (EV_P_ ev_watcher *w, int revents)
+    {
+      K *obj = static_cast<K *>(w->data);
+      (obj->*method) ();
+    }
+
     void operator ()(int events = EV_UNDEF)
     {
       return ev_cb (static_cast<ev_watcher *>(this))