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

diff --git a/ev++.h b/ev++.h
index fea0ac1..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_P_ 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);
     }
 
@@ -37,9 +37,8 @@ namespace ev {
     template<class K, void (K::*method)(watcher &w, int)>
     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>
@@ -51,13 +50,12 @@ namespace ev {
     template<class K, void (K::*method)(watcher &w, int) const>
     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 *data = 0>
-    void set ()
+    template<void (*function)(watcher &w, int)>
+    void set (void *data = 0)
     {
       set_ (data, function_thunk<function>);
     }
@@ -65,8 +63,7 @@ namespace ev {
     template<void (*function)(watcher &w, int)>
     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)