*** empty log message ***

[software/libev.git] / ev++.h

diff --git a/ev++.h b/ev++.h
index aa46fb422ac0425d2475da841771070cdf8505b7..82b65b9453f656e687e736306e90fe842e7d76e7 100644 (file)
--- a/ev++.h
+++ b/ev++.h
@@ -93,15 +93,13 @@ namespace ev {
 
   /* using a template here would require quite a bit more lines,
    * so a macro solution was chosen */
-  #define EV_DECLARE_WATCHER(cppstem,cstem)                                            \
-                                                                                        \
-  extern "C" void cb_ ## cppstem (struct ev_ ## cstem *w, int revents);                 \
+  #define EV_BEGIN_WATCHER(cppstem,cstem)                                              \
                                                                                         \
   struct cppstem : ev_ ## cstem, callback<cppstem>                                      \
   {                                                                                     \
     EV_CONSTRUCT (cppstem)                                                              \
     {                                                                                   \
-      ev_init (static_cast<ev_ ## cstem *>(this), cb_ ## cppstem);                      \
+      ev_init (static_cast<ev_ ## cstem *>(this), thunk);                               \
     }                                                                                   \
                                                                                         \
     bool is_active () const                                                             \
@@ -129,16 +127,30 @@ namespace ev {
       return call (this, events);                                                       \
     }                                                                                   \
                                                                                         \
+    ~cppstem ()                                                                         \
+    {                                                                                   \
+      stop ();                                                                          \
+    }                                                                                   \
+                                                                                        \
   private:                                                                              \
                                                                                         \
     cppstem (const cppstem &o)                                                         \
     : callback<cppstem> (this, (void (cppstem::*)(cppstem &, int))0)                    \
     { /* disabled */ }                                                                 \
+                                                                                        \
     void operator =(const cppstem &o) { /* disabled */ }                                \
                                                                                         \
+    static void thunk (EV_P_ struct ev_ ## cstem *w, int revents)                       \
+    {                                                                                   \
+      (*static_cast<cppstem *>(w))(revents);                                            \
+    }                                                                                   \
+                                                                                        \
   public:
 
-  EV_DECLARE_WATCHER (io, io)
+  #define EV_END_WATCHER(cppstem,cstem)                                                        \
+  };
+
+  EV_BEGIN_WATCHER (io, io)
     void set (int fd, int events)
     {
       int active = is_active ();
@@ -160,9 +172,9 @@ namespace ev {
       set (fd, events);
       start ();
     }
-  };
+  EV_END_WATCHER (io, io)
 
-  EV_DECLARE_WATCHER (timer, timer)
+  EV_BEGIN_WATCHER (timer, timer)
     void set (ev_tstamp after, ev_tstamp repeat = 0.)
     {
       int active = is_active ();
@@ -181,9 +193,10 @@ namespace ev {
     {
       ev_timer_again (EV_A_ static_cast<ev_timer *>(this));
     }
-  };
+  EV_END_WATCHER (timer, timer)
 
-  EV_DECLARE_WATCHER (periodic, periodic)
+  #if EV_PERIODICS
+  EV_BEGIN_WATCHER (periodic, periodic)
     void set (ev_tstamp at, ev_tstamp interval = 0.)
     {
       int active = is_active ();
@@ -202,18 +215,19 @@ namespace ev {
     {
       ev_periodic_again (EV_A_ static_cast<ev_periodic *>(this));
     }
-  };
+  EV_END_WATCHER (periodic, periodic)
+  #endif
 
-  EV_DECLARE_WATCHER (idle, idle)
-  };
+  EV_BEGIN_WATCHER (idle, idle)
+  EV_END_WATCHER (idle, idle)
 
-  EV_DECLARE_WATCHER (prepare, prepare)
-  };
+  EV_BEGIN_WATCHER (prepare, prepare)
+  EV_END_WATCHER (prepare, prepare)
 
-  EV_DECLARE_WATCHER (check, check)
-  };
+  EV_BEGIN_WATCHER (check, check)
+  EV_END_WATCHER (check, check)
 
-  EV_DECLARE_WATCHER (sig, signal)
+  EV_BEGIN_WATCHER (sig, signal)
     void set (int signum)
     {
       int active = is_active ();
@@ -227,9 +241,9 @@ namespace ev {
       set (signum);
       start ();
     }
-  };
+  EV_END_WATCHER (sig, signal)
 
-  EV_DECLARE_WATCHER (child, child)
+  EV_BEGIN_WATCHER (child, child)
     void set (int pid)
     {
       int active = is_active ();
@@ -243,10 +257,10 @@ namespace ev {
       set (pid);
       start ();
     }
-  };
+  EV_END_WATCHER (child, child)
 
   #undef EV_CONSTRUCT
-  #undef EV_DECLARE_WATCHER
+  #undef EV_BEGIN_WATCHER
 }
 
 #endif