X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/80f561c62ce8d30b87e4298b954ce280c4b5465f..1d0c38b8a4f5abc4f06ad5f8b429035d2e465883:/ev%20%20.h/software/libev.git/blobdiff_plain/80f561c62ce8d30b87e4298b954ce280c4b5465f..1d0c38b8a4f5abc4f06ad5f8b429035d2e465883:/ev++.h

diff --git a/ev++.h b/ev++.h
index aa46fb4..48c3a93 100644
--- a/ev++.h
+++ b/ev++.h
@@ -93,9 +93,9 @@ 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)	                                        \
+  #define EV_BEGIN_WATCHER(cppstem,cstem)	                                        \
                                                                                         \
-  extern "C" void cb_ ## cppstem (struct ev_ ## cstem *w, int revents);                 \
+  static void cb_ ## cppstem (struct ev_ ## cstem *w, int revents);                     \
                                                                                         \
   struct cppstem : ev_ ## cstem, callback<cppstem>                                      \
   {                                                                                     \
@@ -129,6 +129,11 @@ namespace ev {
       return call (this, events);                                                       \
     }                                                                                   \
                                                                                         \
+    ~cppstem ()                                                                         \
+    {                                                                                   \
+      stop ();                                                                          \
+    }                                                                                   \
+                                                                                        \
   private:                                                                              \
                                                                                         \
     cppstem (const cppstem &o)								\
@@ -138,7 +143,15 @@ namespace ev {
                                                                                         \
   public:
 
-  EV_DECLARE_WATCHER (io, io)
+  #define EV_END_WATCHER(cppstem,cstem)	                                                \
+  };                                                                                    \
+                                                                                        \
+  static void cb_ ## cppstem (struct ev_ ## cstem *w, int revents)                      \
+  {                                                                                     \
+    (*static_cast<cppstem *>(w))(revents);                                              \
+  }
+
+  EV_BEGIN_WATCHER (io, io)
     void set (int fd, int events)
     {
       int active = is_active ();
@@ -160,9 +173,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 +194,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 +216,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 +242,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 +258,10 @@ namespace ev {
       set (pid);
       start ();
     }
-  };
+  EV_END_WATCHER (child, child)
 
   #undef EV_CONSTRUCT
-  #undef EV_DECLARE_WATCHER
+  #undef EV_BEGIN_WATCHER
 }
 
 #endif