X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/df8e71c4e2c8581ed8f5c4503f30af035c138494..05b6c3fe61a9e53d10406c6b7558c39f0a195514:/ev%20%20.h/software/libev.git/blobdiff_plain/df8e71c4e2c8581ed8f5c4503f30af035c138494..05b6c3fe61a9e53d10406c6b7558c39f0a195514:/ev++.h?ds=sidebyside

diff --git a/ev++.h b/ev++.h
index 6086a97..604340e 100644
--- a/ev++.h
+++ b/ev++.h
@@ -22,9 +22,9 @@ namespace ev {
       ev_init (this, 0);
     }
 
-    void set_ (void *object, void (*cb)(ev_watcher *w, int revents))
+    void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents))
     {
-      this->data = object;
+      this->data = data;
       ev_set_cb (static_cast<ev_watcher *>(this), cb);
     }
 
@@ -35,11 +35,10 @@ 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);
-      (obj->*method) (*self, revents);
+      K *obj = static_cast<K *>(w->data);
+      (obj->*method) (*static_cast<watcher *>(w), revents);
     }
 
     template<class K, void (K::*method)(watcher &w, int) const>
@@ -49,29 +48,28 @@ 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);
+      K *obj = static_cast<K *>(w->data);
+      (static_cast<K *>(w->data)->*method) (*static_cast<watcher *>(w), revents);
     }
 
     template<void (*function)(watcher &w, int)>
-    void set ()
+    void set (void *data = 0)
     {
-      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);
+      function (*static_cast<watcher *>(w), revents);
     }
 
     void operator ()(int events = EV_UNDEF)
     {
-      return e_cb (static_cast<ev_watcher *>(this)) (events);
+      return ev_cb (static_cast<ev_watcher *>(this))
+        (static_cast<ev_watcher *>(this), events);
     }
 
     bool is_active () const