--- gvpe/src/iom.h	2003/03/28 04:05:10	1.6
+++ gvpe/src/iom.h	2003/04/02 05:15:00	1.9
@@ -23,13 +23,13 @@
 
 #include <sys/poll.h>
 
+#include "callback.h"
 #include "slog.h"
 
 typedef double tstamp;
 
 extern tstamp NOW;
 
-template<class R, class A> class callback;
 struct io_watcher;
 struct time_watcher;
 
@@ -45,9 +45,9 @@
 
   // register a watcher
   void reg (int fd, short events, io_watcher *w);
-  void unreg (const io_watcher *w);
+  void unreg (io_watcher *w);
   void reg (time_watcher *w);
-  void unreg (const time_watcher *w);
+  void unreg (time_watcher *w);
   
   void loop ();
 
@@ -57,53 +57,10 @@
 
 extern io_manager iom;
 
-template<class R, class A>
-class callback {
-  struct object { };
-
-  void *obj;
-  R (object::*meth)(A arg);
-
-  // a proxy is a kind of recipe on how to call a specific class method
-  struct proxy_base {
-    virtual R call (void *obj, R (object::*meth)(A), A arg) = 0;
-  };
+struct io_watcher : callback2<void, int, short> {
   template<class O1, class O2>
-  struct proxy : proxy_base {
-    virtual R call (void *obj, R (object::*meth)(A), A arg)
-      {
-        ((reinterpret_cast<O1 *>(obj)) ->* (reinterpret_cast<R (O2::*)(A)>(meth)))
-          (arg);
-      }
-  };
-
-  proxy_base *prxy;
-
-public:
-  template<class O1, class O2>
-  callback (O1 *object, R (O2::*method)(A))
-    {
-      static proxy<O1,O2> p;
-      obj  = reinterpret_cast<void *>(object);
-      meth = reinterpret_cast<R (object::*)(A)>(method);
-      prxy = &p;
-    }
-
-  R call(A arg) const
-    {
-      return prxy->call (obj, meth, arg);
-    }
-
-  R operator ()(A arg) const
-    {
-      return call (arg);
-    }
-};
-
-struct io_watcher : callback<void, short> {
-  template<class O1, class O2>
-  io_watcher (O1 *object, void (O2::*method)(short revents))
-    : callback<void, short>(object,method)
+  io_watcher (O1 *object, void (O2::*method)(int fd, short revents))
+    : callback2<void, int, short>(object,method)
     { }
 
   ~io_watcher ()
@@ -116,7 +73,7 @@
       iom.reg (fd, events, this);
     }
 
-  void stop () const
+  void stop ()
     {
       iom.unreg (this);
     }
@@ -124,13 +81,13 @@
 
 #define TSTAMP_CANCEL -1.
 
-struct time_watcher : callback<void, tstamp &> {
+struct time_watcher : callback1<void, tstamp &> {
   bool registered; // already registered?
   tstamp at;
 
   template<class O1, class O2>
   time_watcher (O1 *object, void (O2::*method)(tstamp &))
-    : callback<void, tstamp &>(object,method)
+    : callback1<void, tstamp &>(object,method)
     , registered(false)
     { }
 
@@ -153,7 +110,7 @@
       set (when);
     }
 
-  void stop () const
+  void stop ()
     {
       iom.unreg (this);
     }