X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/0a7b0ac074d9987c6fa23ab20be4842e4514c7b9..7f61bc3d979ef53b867172664694f8fcf9e5bdd0:/ev%20%20.h/software/libev.git/blobdiff_plain/0a7b0ac074d9987c6fa23ab20be4842e4514c7b9..7f61bc3d979ef53b867172664694f8fcf9e5bdd0:/ev++.h

diff --git a/ev++.h b/ev++.h
index cac1d03..fea0ac1 100644
--- a/ev++.h
+++ b/ev++.h
@@ -22,7 +22,7 @@ namespace ev {
       ev_init (this, 0);
     }
 
-    void set_ (void *object, void (*cb)(ev_watcher *w, int revents))
+    void set_ (void *object, void (*cb)(EV_P_ ev_watcher *w, int revents))
     {
       this->data = object;
       ev_set_cb (static_cast<ev_watcher *>(this), cb);
@@ -35,7 +35,7 @@ namespace ev {
     }
 
     template<class K, void (K::*method)(watcher &w, int)>
-    static void method_thunk (ev_watcher *w, int revents)
+    static void method_thunk (EV_P_ ev_watcher *w, int revents)
     {
       watcher *self = static_cast<watcher *>(w);
       K *obj = static_cast<K *>(self->data);
@@ -49,21 +49,21 @@ namespace ev {
     }
 
     template<class K, void (K::*method)(watcher &w, int) const>
-    static void const_method_thunk (ev_watcher *w, int revents)
+    static void const_method_thunk (EV_P_ ev_watcher *w, int revents)
     {
       watcher *self = static_cast<watcher *>(w);
       K *obj = static_cast<K *>(self->data);
       (obj->*method) (*self, revents);
     }
 
-    template<void (*function)(watcher &w, int)>
+    template<void (*function)(watcher &w, int), void *data = 0>
     void set ()
     {
-      set_ (0, function_thunk<function>);
+      set_ (data, function_thunk<function>);
     }
 
     template<void (*function)(watcher &w, int)>
-    static void function_thunk (ev_watcher *w, int revents)
+    static void function_thunk (EV_P_ ev_watcher *w, int revents)
     {
       watcher *self = static_cast<watcher *>(w);
       function (*self, revents);