X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/57e6fe17689de1646a53a20a46374936391db3e2..471c0cc622684d85d6361cc79f32e2436ad079e5:/ev%20%20.h/software/libev.git/blobdiff_plain/57e6fe17689de1646a53a20a46374936391db3e2..471c0cc622684d85d6361cc79f32e2436ad079e5:/ev++.h?ds=sidebyside diff --git a/ev++.h b/ev++.h index 71a3d52..604340e 100644 --- a/ev++.h +++ b/ev++.h @@ -22,10 +22,10 @@ namespace ev { ev_init (this, 0); } - void set_ (void *data, void (*cb)(EV_P_ watcher *w, int revents)) + void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) { this->data = data; - ev_set_cb (static_cast(this), cb); + ev_set_cb (static_cast(this), cb); } template @@ -35,10 +35,10 @@ namespace ev { } template - static void method_thunk (EV_P_ watcher *w, int revents) + static void method_thunk (EV_P_ ev_watcher *w, int revents) { K *obj = static_cast(w->data); - (obj->*method) (*w, revents); + (obj->*method) (*static_cast(w), revents); } template @@ -48,10 +48,10 @@ namespace ev { } template - static void const_method_thunk (EV_P_ watcher *w, int revents) + static void const_method_thunk (EV_P_ ev_watcher *w, int revents) { K *obj = static_cast(w->data); - (obj->*method) (*w, revents); + (static_cast(w->data)->*method) (*static_cast(w), revents); } template @@ -61,9 +61,9 @@ namespace ev { } template - static void function_thunk (EV_P_ watcher *w, int revents) + static void function_thunk (EV_P_ ev_watcher *w, int revents) { - function (*w, revents); + function (*static_cast(w), revents); } void operator ()(int events = EV_UNDEF)