--- gvpe/src/callback.pl	2007/12/04 17:17:19	1.12
+++ gvpe/src/callback.pl	2007/12/05 18:19:50	1.13
@@ -56,30 +56,6 @@
 {
   typedef R (*ptr_type)(void *self$_TYPE);
 
-private:
-
-  void *self;
-  ptr_type func;
-
-protected:
-
-  template<typename method>
-  struct thunktype;
-
-  template<class klass>
-  struct thunktype<R (klass::*)>
-  {
-    typedef klass K;
-  };
-
-  template<class klass, R (klass::*method)($TYPE)>
-  static R thunk (void *self$_TYPEARG)
-  {
-    klass *obj = static_cast<klass *>(self);
-    return (obj->*method) ($ARG);
-  }
-
-public:
   template<class K, R (K::*method)($TYPE)>
   void set (K *object)
   {
@@ -96,6 +72,18 @@
   {
     return call ($ARG);
   }
+
+private:
+
+  void *self;
+  ptr_type func;
+
+  template<class klass, R (klass::*method)($TYPE)>
+  static R thunk (void *self$_TYPEARG)
+  {
+    klass *obj = static_cast<klass *>(self);
+    return (obj->*method) ($ARG);
+  }
 };
 
 EOF