--- libev/ev++.h	2007/11/14 06:08:13	1.6
+++ libev/ev++.h	2007/11/29 17:36:35	1.12
@@ -1,51 +1,36 @@
 #ifndef EVPP_H__
 #define EVPP_H__
 
-/* work in progress, don't use unless you know what you are doing */
+#include "ev.h"
 
 namespace ev {
 
   template<class watcher>
   class callback
   {
-    struct object { };
+    struct klass; // it is vital that this is never defined
 
-    void *obj;
-    void (object::*meth)(watcher &, int);
-
-    /* a proxy is a kind of recipe on how to call a specific class method */
-    struct proxy_base {
-      virtual void call (void *obj, void (object::*meth)(watcher &, int), watcher &w, int) const = 0;
-    };
-    template<class O1, class O2>
-    struct proxy : proxy_base {
-      virtual void call (void *obj, void (object::*meth)(watcher &, int), watcher &w, int e) const
-      {
-        ((reinterpret_cast<O1 *>(obj)) ->* (reinterpret_cast<void (O2::*)(watcher &, int)>(meth)))
-          (w, e);
-      }
-    };
-
-    proxy_base *prxy;
+    klass *o;
+    void (klass::*m)(watcher &, int);
 
   public:
     template<class O1, class O2>
     explicit callback (O1 *object, void (O2::*method)(watcher &, int))
     {
-      static proxy<O1,O2> p;
-      obj  = reinterpret_cast<void *>(object);
-      meth = reinterpret_cast<void (object::*)(watcher &, int)>(method);
-      prxy = &p;
+      o = reinterpret_cast<klass *>(object);
+      m = reinterpret_cast<void (klass::*)(watcher &, int)>(method);
     }
 
-    void call (watcher *w, int e) const
+    // this works because a standards-compliant C++ compiler
+    // basically can't help it: it doesn't have the knowledge
+    // required to miscompile (klass is not defined anywhere
+    // and nothing is known about the constructor arguments) :)
+    void call (watcher *w, int revents)
     {
-      return prxy->call (obj, meth, *w, e);
+      (o->*m) (*w, revents);
     }
   };
 
-  #include "ev.h"
-
   enum {
     UNDEF    = EV_UNDEF,
     NONE     = EV_NONE,
@@ -54,10 +39,13 @@
     TIMEOUT  = EV_TIMEOUT,
     PERIODIC = EV_PERIODIC,
     SIGNAL   = EV_SIGNAL,
+    CHILD    = EV_CHILD,
+    STAT     = EV_STAT,
     IDLE     = EV_IDLE,
     CHECK    = EV_CHECK,
     PREPARE  = EV_PREPARE,
-    CHILD    = EV_CHILD,
+    FORK     = EV_FORK,
+    EMBED    = EV_EMBED,
     ERROR    = EV_ERROR,
   };
 
@@ -195,7 +183,7 @@
     }
   EV_END_WATCHER (timer, timer)
 
-  #if EV_PERIODICS
+  #if EV_PERIODIC_ENABLE
   EV_BEGIN_WATCHER (periodic, periodic)
     void set (ev_tstamp at, ev_tstamp interval = 0.)
     {
@@ -218,15 +206,6 @@
   EV_END_WATCHER (periodic, periodic)
   #endif
 
-  EV_BEGIN_WATCHER (idle, idle)
-  EV_END_WATCHER (idle, idle)
-
-  EV_BEGIN_WATCHER (prepare, prepare)
-  EV_END_WATCHER (prepare, prepare)
-
-  EV_BEGIN_WATCHER (check, check)
-  EV_END_WATCHER (check, check)
-
   EV_BEGIN_WATCHER (sig, signal)
     void set (int signum)
     {
@@ -259,8 +238,67 @@
     }
   EV_END_WATCHER (child, child)
 
+  #if EV_STAT_ENABLE
+  EV_BEGIN_WATCHER (stat, stat)
+    void set (const char *path, ev_tstamp interval = 0.)
+    {
+      int active = is_active ();
+      if (active) stop ();
+      ev_stat_set (static_cast<ev_stat *>(this), path, interval);
+      if (active) start ();
+    }
+
+    void start (const char *path, ev_tstamp interval = 0.)
+    {
+      stop ();
+      set (path, interval);
+      start ();
+    }
+
+    void update ()
+    {
+      ev_stat_stat (EV_A_ static_cast<ev_stat *>(this));
+    }
+  EV_END_WATCHER (stat, stat)
+  #endif
+
+  EV_BEGIN_WATCHER (idle, idle)
+    void set () { }
+  EV_END_WATCHER (idle, idle)
+
+  EV_BEGIN_WATCHER (prepare, prepare)
+    void set () { }
+  EV_END_WATCHER (prepare, prepare)
+
+  EV_BEGIN_WATCHER (check, check)
+    void set () { }
+  EV_END_WATCHER (check, check)
+
+  #if EV_EMBED_ENABLE
+  EV_BEGIN_WATCHER (embed, embed)
+    void start (struct ev_loop *embedded_loop)
+    {
+      stop ();
+      ev_embed_set (static_cast<ev_embed *>(this), embedded_loop);
+      start ();
+    }
+
+    void sweep ()
+    {
+      ev_embed_sweep (EV_A_ static_cast<ev_embed *>(this));
+    }
+  EV_END_WATCHER (embed, embed)
+  #endif
+
+  #if EV_FORK_ENABLE
+  EV_BEGIN_WATCHER (fork, fork)
+    void set () { }
+  EV_END_WATCHER (fork, fork)
+  #endif
+
   #undef EV_CONSTRUCT
   #undef EV_BEGIN_WATCHER
+  #undef EV_END_WATCHER
 }
 
 #endif