updated callback.h/iom.h from gvpe

diff --git a/src/callback.h b/src/callback.h
index a882e85b9157bc4468a8a3f1a2ff6bf8a9fca0e4..aa0c291a95edc3835f96d8cdad489d0b198bb144 100644 (file)
--- a/src/callback.h
+++ b/src/callback.h
@@ -26,10 +26,21 @@
 #ifndef CALLBACK_H__
 #define CALLBACK_H__
 
+#define CALLBACK_H_VERSION 2
+
+template<class signature>
+struct callback_funtype_trait;
+
+template<int arity, class signature>
+struct callback_get_impl;
+
 template<class R>
-class callback0 {
+class callback0
+{
   struct object { };
 
+  typedef R (object::*ptr_type)();
+
   void *obj;
   R (object::*meth)();
 
@@ -69,10 +80,34 @@ public:
     }
 };
 
+template<class R>
+struct callback_funtype_trait0
+{
+  static const int arity = 0;
+  typedef R type (void);
+  typedef R result_type;
+  
+};
+
+template<class R>
+struct callback_funtype_trait<R ()> : callback_funtype_trait0<R>
+{
+};
+
+template<class signature>
+struct callback_get_impl<0, signature>
+{
+  typedef callback_funtype_trait<signature> T;
+  typedef callback0<typename T::result_type> type;
+};
+   
 template<class R, class A1>
-class callback1 {
+class callback1
+{
   struct object { };
 
+  typedef R (object::*ptr_type)(A1);
+
   void *obj;
   R (object::*meth)(A1);
 
@@ -112,10 +147,34 @@ public:
     }
 };
 
+template<class R, class A1>
+struct callback_funtype_trait1
+{
+  static const int arity = 1;
+  typedef R type (A1);
+  typedef R result_type;
+  typedef A1 arg1_type;
+};
+
+template<class R, class A1>
+struct callback_funtype_trait<R (A1)> : callback_funtype_trait1<R, A1>
+{
+};
+
+template<class signature>
+struct callback_get_impl<1, signature>
+{
+  typedef callback_funtype_trait<signature> T;
+  typedef callback1<typename T::result_type, typename T::arg1_type> type;
+};
+   
 template<class R, class A1, class A2>
-class callback2 {
+class callback2
+{
   struct object { };
 
+  typedef R (object::*ptr_type)(A1, A2);
+
   void *obj;
   R (object::*meth)(A1, A2);
 
@@ -155,10 +214,34 @@ public:
     }
 };
 
+template<class R, class A1, class A2>
+struct callback_funtype_trait2
+{
+  static const int arity = 2;
+  typedef R type (A1, A2);
+  typedef R result_type;
+  typedef A1 arg1_type; typedef A2 arg2_type;
+};
+
+template<class R, class A1, class A2>
+struct callback_funtype_trait<R (A1, A2)> : callback_funtype_trait2<R, A1, A2>
+{
+};
+
+template<class signature>
+struct callback_get_impl<2, signature>
+{
+  typedef callback_funtype_trait<signature> T;
+  typedef callback2<typename T::result_type, typename T::arg1_type, typename T::arg2_type> type;
+};
+   
 template<class R, class A1, class A2, class A3>
-class callback3 {
+class callback3
+{
   struct object { };
 
+  typedef R (object::*ptr_type)(A1, A2, A3);
+
   void *obj;
   R (object::*meth)(A1, A2, A3);
 
@@ -198,10 +281,34 @@ public:
     }
 };
 
+template<class R, class A1, class A2, class A3>
+struct callback_funtype_trait3
+{
+  static const int arity = 3;
+  typedef R type (A1, A2, A3);
+  typedef R result_type;
+  typedef A1 arg1_type; typedef A2 arg2_type; typedef A3 arg3_type;
+};
+
+template<class R, class A1, class A2, class A3>
+struct callback_funtype_trait<R (A1, A2, A3)> : callback_funtype_trait3<R, A1, A2, A3>
+{
+};
+
+template<class signature>
+struct callback_get_impl<3, signature>
+{
+  typedef callback_funtype_trait<signature> T;
+  typedef callback3<typename T::result_type, typename T::arg1_type, typename T::arg2_type, typename T::arg3_type> type;
+};
+   
 template<class R, class A1, class A2, class A3, class A4>
-class callback4 {
+class callback4
+{
   struct object { };
 
+  typedef R (object::*ptr_type)(A1, A2, A3, A4);
+
   void *obj;
   R (object::*meth)(A1, A2, A3, A4);
 
@@ -241,10 +348,34 @@ public:
     }
 };
 
+template<class R, class A1, class A2, class A3, class A4>
+struct callback_funtype_trait4
+{
+  static const int arity = 4;
+  typedef R type (A1, A2, A3, A4);
+  typedef R result_type;
+  typedef A1 arg1_type; typedef A2 arg2_type; typedef A3 arg3_type; typedef A4 arg4_type;
+};
+
+template<class R, class A1, class A2, class A3, class A4>
+struct callback_funtype_trait<R (A1, A2, A3, A4)> : callback_funtype_trait4<R, A1, A2, A3, A4>
+{
+};
+
+template<class signature>
+struct callback_get_impl<4, signature>
+{
+  typedef callback_funtype_trait<signature> T;
+  typedef callback4<typename T::result_type, typename T::arg1_type, typename T::arg2_type, typename T::arg3_type, typename T::arg4_type> type;
+};
+   
 template<class R, class A1, class A2, class A3, class A4, class A5>
-class callback5 {
+class callback5
+{
   struct object { };
 
+  typedef R (object::*ptr_type)(A1, A2, A3, A4, A5);
+
   void *obj;
   R (object::*meth)(A1, A2, A3, A4, A5);
 
@@ -284,10 +415,34 @@ public:
     }
 };
 
+template<class R, class A1, class A2, class A3, class A4, class A5>
+struct callback_funtype_trait5
+{
+  static const int arity = 5;
+  typedef R type (A1, A2, A3, A4, A5);
+  typedef R result_type;
+  typedef A1 arg1_type; typedef A2 arg2_type; typedef A3 arg3_type; typedef A4 arg4_type; typedef A5 arg5_type;
+};
+
+template<class R, class A1, class A2, class A3, class A4, class A5>
+struct callback_funtype_trait<R (A1, A2, A3, A4, A5)> : callback_funtype_trait5<R, A1, A2, A3, A4, A5>
+{
+};
+
+template<class signature>
+struct callback_get_impl<5, signature>
+{
+  typedef callback_funtype_trait<signature> T;
+  typedef callback5<typename T::result_type, typename T::arg1_type, typename T::arg2_type, typename T::arg3_type, typename T::arg4_type, typename T::arg5_type> type;
+};
+   
 template<class R, class A1, class A2, class A3, class A4, class A5, class A6>
-class callback6 {
+class callback6
+{
   struct object { };
 
+  typedef R (object::*ptr_type)(A1, A2, A3, A4, A5, A6);
+
   void *obj;
   R (object::*meth)(A1, A2, A3, A4, A5, A6);
 
@@ -327,10 +482,34 @@ public:
     }
 };
 
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6>
+struct callback_funtype_trait6
+{
+  static const int arity = 6;
+  typedef R type (A1, A2, A3, A4, A5, A6);
+  typedef R result_type;
+  typedef A1 arg1_type; typedef A2 arg2_type; typedef A3 arg3_type; typedef A4 arg4_type; typedef A5 arg5_type; typedef A6 arg6_type;
+};
+
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6>
+struct callback_funtype_trait<R (A1, A2, A3, A4, A5, A6)> : callback_funtype_trait6<R, A1, A2, A3, A4, A5, A6>
+{
+};
+
+template<class signature>
+struct callback_get_impl<6, signature>
+{
+  typedef callback_funtype_trait<signature> T;
+  typedef callback6<typename T::result_type, typename T::arg1_type, typename T::arg2_type, typename T::arg3_type, typename T::arg4_type, typename T::arg5_type, typename T::arg6_type> type;
+};
+   
 template<class R, class A1, class A2, class A3, class A4, class A5, class A6, class A7>
-class callback7 {
+class callback7
+{
   struct object { };
 
+  typedef R (object::*ptr_type)(A1, A2, A3, A4, A5, A6, A7);
+
   void *obj;
   R (object::*meth)(A1, A2, A3, A4, A5, A6, A7);
 
@@ -370,4 +549,239 @@ public:
     }
 };
 
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6, class A7>
+struct callback_funtype_trait7
+{
+  static const int arity = 7;
+  typedef R type (A1, A2, A3, A4, A5, A6, A7);
+  typedef R result_type;
+  typedef A1 arg1_type; typedef A2 arg2_type; typedef A3 arg3_type; typedef A4 arg4_type; typedef A5 arg5_type; typedef A6 arg6_type; typedef A7 arg7_type;
+};
+
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6, class A7>
+struct callback_funtype_trait<R (A1, A2, A3, A4, A5, A6, A7)> : callback_funtype_trait7<R, A1, A2, A3, A4, A5, A6, A7>
+{
+};
+
+template<class signature>
+struct callback_get_impl<7, signature>
+{
+  typedef callback_funtype_trait<signature> T;
+  typedef callback7<typename T::result_type, typename T::arg1_type, typename T::arg2_type, typename T::arg3_type, typename T::arg4_type, typename T::arg5_type, typename T::arg6_type, typename T::arg7_type> type;
+};
+   
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
+class callback8
+{
+  struct object { };
+
+  typedef R (object::*ptr_type)(A1, A2, A3, A4, A5, A6, A7, A8);
+
+  void *obj;
+  R (object::*meth)(A1, A2, A3, A4, A5, A6, A7, A8);
+
+  /* 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)(A1, A2, A3, A4, A5, A6, A7, A8), A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const = 0;
+  };
+  template<class O1, class O2>
+  struct proxy : proxy_base {
+    virtual R call (void *obj, R (object::*meth)(A1, A2, A3, A4, A5, A6, A7, A8), A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const
+      {
+        return (R)((reinterpret_cast<O1 *>(obj)) ->* (reinterpret_cast<R (O2::*)(A1, A2, A3, A4, A5, A6, A7, A8)>(meth)))
+          (a1, a2, a3, a4, a5, a6, a7, a8);
+      }
+  };
+
+  proxy_base *prxy;
+
+public:
+  template<class O1, class O2>
+  explicit callback8 (O1 *object, R (O2::*method)(A1, A2, A3, A4, A5, A6, A7, A8))
+    {
+      static proxy<O1,O2> p;
+      obj  = reinterpret_cast<void *>(object);
+      meth = reinterpret_cast<R (object::*)(A1, A2, A3, A4, A5, A6, A7, A8)>(method);
+      prxy = &p;
+    }
+
+  R call(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const
+    {
+      return prxy->call (obj, meth, a1, a2, a3, a4, a5, a6, a7, a8);
+    }
+
+  R operator ()(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) const
+    {
+      return call (a1, a2, a3, a4, a5, a6, a7, a8);
+    }
+};
+
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
+struct callback_funtype_trait8
+{
+  static const int arity = 8;
+  typedef R type (A1, A2, A3, A4, A5, A6, A7, A8);
+  typedef R result_type;
+  typedef A1 arg1_type; typedef A2 arg2_type; typedef A3 arg3_type; typedef A4 arg4_type; typedef A5 arg5_type; typedef A6 arg6_type; typedef A7 arg7_type; typedef A8 arg8_type;
+};
+
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8>
+struct callback_funtype_trait<R (A1, A2, A3, A4, A5, A6, A7, A8)> : callback_funtype_trait8<R, A1, A2, A3, A4, A5, A6, A7, A8>
+{
+};
+
+template<class signature>
+struct callback_get_impl<8, signature>
+{
+  typedef callback_funtype_trait<signature> T;
+  typedef callback8<typename T::result_type, typename T::arg1_type, typename T::arg2_type, typename T::arg3_type, typename T::arg4_type, typename T::arg5_type, typename T::arg6_type, typename T::arg7_type, typename T::arg8_type> type;
+};
+   
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
+class callback9
+{
+  struct object { };
+
+  typedef R (object::*ptr_type)(A1, A2, A3, A4, A5, A6, A7, A8, A9);
+
+  void *obj;
+  R (object::*meth)(A1, A2, A3, A4, A5, A6, A7, A8, A9);
+
+  /* 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)(A1, A2, A3, A4, A5, A6, A7, A8, A9), A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) const = 0;
+  };
+  template<class O1, class O2>
+  struct proxy : proxy_base {
+    virtual R call (void *obj, R (object::*meth)(A1, A2, A3, A4, A5, A6, A7, A8, A9), A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) const
+      {
+        return (R)((reinterpret_cast<O1 *>(obj)) ->* (reinterpret_cast<R (O2::*)(A1, A2, A3, A4, A5, A6, A7, A8, A9)>(meth)))
+          (a1, a2, a3, a4, a5, a6, a7, a8, a9);
+      }
+  };
+
+  proxy_base *prxy;
+
+public:
+  template<class O1, class O2>
+  explicit callback9 (O1 *object, R (O2::*method)(A1, A2, A3, A4, A5, A6, A7, A8, A9))
+    {
+      static proxy<O1,O2> p;
+      obj  = reinterpret_cast<void *>(object);
+      meth = reinterpret_cast<R (object::*)(A1, A2, A3, A4, A5, A6, A7, A8, A9)>(method);
+      prxy = &p;
+    }
+
+  R call(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) const
+    {
+      return prxy->call (obj, meth, a1, a2, a3, a4, a5, a6, a7, a8, a9);
+    }
+
+  R operator ()(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) const
+    {
+      return call (a1, a2, a3, a4, a5, a6, a7, a8, a9);
+    }
+};
+
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
+struct callback_funtype_trait9
+{
+  static const int arity = 9;
+  typedef R type (A1, A2, A3, A4, A5, A6, A7, A8, A9);
+  typedef R result_type;
+  typedef A1 arg1_type; typedef A2 arg2_type; typedef A3 arg3_type; typedef A4 arg4_type; typedef A5 arg5_type; typedef A6 arg6_type; typedef A7 arg7_type; typedef A8 arg8_type; typedef A9 arg9_type;
+};
+
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9>
+struct callback_funtype_trait<R (A1, A2, A3, A4, A5, A6, A7, A8, A9)> : callback_funtype_trait9<R, A1, A2, A3, A4, A5, A6, A7, A8, A9>
+{
+};
+
+template<class signature>
+struct callback_get_impl<9, signature>
+{
+  typedef callback_funtype_trait<signature> T;
+  typedef callback9<typename T::result_type, typename T::arg1_type, typename T::arg2_type, typename T::arg3_type, typename T::arg4_type, typename T::arg5_type, typename T::arg6_type, typename T::arg7_type, typename T::arg8_type, typename T::arg9_type> type;
+};
+   
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9, class A10>
+class callback10
+{
+  struct object { };
+
+  typedef R (object::*ptr_type)(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10);
+
+  void *obj;
+  R (object::*meth)(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10);
+
+  /* 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)(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10), A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10) const = 0;
+  };
+  template<class O1, class O2>
+  struct proxy : proxy_base {
+    virtual R call (void *obj, R (object::*meth)(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10), A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10) const
+      {
+        return (R)((reinterpret_cast<O1 *>(obj)) ->* (reinterpret_cast<R (O2::*)(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)>(meth)))
+          (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
+      }
+  };
+
+  proxy_base *prxy;
+
+public:
+  template<class O1, class O2>
+  explicit callback10 (O1 *object, R (O2::*method)(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10))
+    {
+      static proxy<O1,O2> p;
+      obj  = reinterpret_cast<void *>(object);
+      meth = reinterpret_cast<R (object::*)(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)>(method);
+      prxy = &p;
+    }
+
+  R call(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10) const
+    {
+      return prxy->call (obj, meth, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
+    }
+
+  R operator ()(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10) const
+    {
+      return call (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
+    }
+};
+
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9, class A10>
+struct callback_funtype_trait10
+{
+  static const int arity = 10;
+  typedef R type (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10);
+  typedef R result_type;
+  typedef A1 arg1_type; typedef A2 arg2_type; typedef A3 arg3_type; typedef A4 arg4_type; typedef A5 arg5_type; typedef A6 arg6_type; typedef A7 arg7_type; typedef A8 arg8_type; typedef A9 arg9_type; typedef A10 arg10_type;
+};
+
+template<class R, class A1, class A2, class A3, class A4, class A5, class A6, class A7, class A8, class A9, class A10>
+struct callback_funtype_trait<R (A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)> : callback_funtype_trait10<R, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>
+{
+};
+
+template<class signature>
+struct callback_get_impl<10, signature>
+{
+  typedef callback_funtype_trait<signature> T;
+  typedef callback10<typename T::result_type, typename T::arg1_type, typename T::arg2_type, typename T::arg3_type, typename T::arg4_type, typename T::arg5_type, typename T::arg6_type, typename T::arg7_type, typename T::arg8_type, typename T::arg9_type, typename T::arg10_type> type;
+};
+   
+
+template<class signature>
+struct callback : callback_get_impl<callback_funtype_trait<signature>::arity, signature>::type
+{
+  typedef typename callback_get_impl<callback_funtype_trait<signature>::arity, signature>::type base_type;
+
+  template<class O, class M>
+  explicit callback (O object, M method)
+    : base_type (object, method)
+    {
+    }
+};
+
 #endif

diff --git a/src/iom.h b/src/iom.h
index 5acb98b5e5ad352480dc6431c065d41453485c2c..e717b527bbe090f45ee694749ab5ff780c5c2fbe 100644 (file)
--- a/src/iom.h
+++ b/src/iom.h
@@ -125,7 +125,7 @@ struct watcher {
 #if IOM_IO
 enum { EVENT_UNDEF = -1, EVENT_NONE = 0, EVENT_READ = 1, EVENT_WRITE = 2 };
 
-struct io_watcher : watcher, callback2<void, io_watcher &, short> {
+struct io_watcher : watcher, callback<void (io_watcher &, short)> {
   int fd;
   short events;
 
@@ -138,14 +138,14 @@ struct io_watcher : watcher, callback2<void, io_watcher &, short> {
 
   template<class O1, class O2>
   io_watcher (O1 *object, void (O2::*method) (io_watcher &, short))
-  : callback2<void, io_watcher &, short> (object, method)
+  : callback<void (io_watcher &, short)> (object, method)
   { }
   ~io_watcher () { stop (); }
 };
 #endif
 
 #if IOM_TIME
-struct time_watcher : watcher, callback1<void, time_watcher &> {
+struct time_watcher : watcher, callback<void (time_watcher &)> {
   tstamp at;
 
   void trigger ();
@@ -158,7 +158,7 @@ struct time_watcher : watcher, callback1<void, time_watcher &> {
 
   template<class O1, class O2>
   time_watcher (O1 *object, void (O2::*method) (time_watcher &))
-  : callback1<void, time_watcher &> (object, method), at (0)
+  : callback<void (time_watcher &)> (object, method), at (0)
   { }
   ~time_watcher () { stop (); }
 };
@@ -166,13 +166,13 @@ struct time_watcher : watcher, callback1<void, time_watcher &> {
 
 #if IOM_CHECK
 // run before checking for new events
-struct check_watcher : watcher, callback1<void, check_watcher &> {
+struct check_watcher : watcher, callback<void (check_watcher &)> {
   void start () { io_manager::reg (*this); }
   void stop () { io_manager::unreg (*this); }
 
   template<class O1, class O2>
   check_watcher (O1 *object, void (O2::*method) (check_watcher &))
-  : callback1<void, check_watcher &> (object, method)
+  : callback<void (check_watcher &)> (object, method)
   { }
   ~check_watcher () { stop (); }
 };
@@ -180,20 +180,20 @@ struct check_watcher : watcher, callback1<void, check_watcher &> {
 
 #if IOM_IDLE
 // run after checking for any i/o, but before waiting
-struct idle_watcher : watcher, callback1<void, idle_watcher &> {
+struct idle_watcher : watcher, callback<void (idle_watcher &)> {
   void start () { io_manager::reg (*this); }
   void stop () { io_manager::unreg (*this); }
 
   template<class O1, class O2>
   idle_watcher (O1 *object, void (O2::*method) (idle_watcher &))
-    : callback1<void, idle_watcher &> (object, method)
+    : callback<void (idle_watcher &)> (object, method)
     { }
   ~idle_watcher () { stop (); }
 };
 #endif
 
 #if IOM_SIG
-struct sig_watcher : watcher, callback1<void, sig_watcher &> {
+struct sig_watcher : watcher, callback<void (sig_watcher &)> {
   int signum;
 
   void start (int signum);
@@ -201,14 +201,14 @@ struct sig_watcher : watcher, callback1<void, sig_watcher &> {
 
   template<class O1, class O2>
   sig_watcher (O1 *object, void (O2::*method) (sig_watcher &))
-  : callback1<void, sig_watcher &> (object, method), signum (0)
+  : callback<void(sig_watcher &)> (object, method), signum (0)
   { }
   ~sig_watcher () { stop (); }
 };
 #endif
 
 #if IOM_CHILD
-struct child_watcher : watcher, callback2<void, child_watcher &, int> {
+struct child_watcher : watcher, callback<void (child_watcher &, int)> {
   int /*pid_t*/ pid;
 
   void start (int pid) { this->pid = pid; io_manager::reg (*this); }
@@ -216,7 +216,7 @@ struct child_watcher : watcher, callback2<void, child_watcher &, int> {
 
   template<class O1, class O2>
   child_watcher (O1 *object, void (O2::*method) (child_watcher &, int status))
-  : callback2<void, child_watcher &, int> (object, method), pid (0)
+  : callback<void (child_watcher &, int)> (object, method), pid (0)
   { }
   ~child_watcher () { stop (); }
 };