[sigc] adaptor_type error in compose2_functor - patch attached.

[Jeff Franks <jcf tpg com au>]

Martin,

You missed one adaptor_type error - compose2_functor in compose.h. It's 
only one line but I sent a patch any way.

It wasn't compiling libsigc++2 that gave the errors. It was compiling my 
GObject/GTK+ signal wrapper code. Anyway, it now compiles with out 
error. Thanks for the extra sigc::connection constructor. That was the 
missing piece of code that I needed.

Regards,

Jeff Franks.

diff -ru libsigc++-1.9.9/sigc++/adaptors/compose.h.m4 libsigc++-1.9.9-new/sigc++/adaptors/compose.h.m4
--- libsigc++-1.9.9/sigc++/adaptors/compose.h.m4	2003-10-21 04:14:20.000000000 +1000
+++ libsigc++-1.9.9-new/sigc++/adaptors/compose.h.m4	2003-10-21 05:25:23.000000000 +1000
@@ -1,4 +1,4 @@
-dnl Copyright 2002, The libsigc++ Development Team 
+dnl Copyright 2002, The libsigc++ Development Team
 dnl 
 dnl This library is free software; you can redistribute it and/or 
 dnl modify it under the terms of the GNU Lesser General Public 
@@ -78,6 +78,8 @@
 template <class T_setter, class T_getter1, class T_getter2>
 struct compose2_functor : public adapts<T_setter>
 {
+  typedef typename adapts<T_setter>::adaptor_type adaptor_type;
+
   template <LOOP(class T_arg%1=void, CALL_SIZE)>
   struct deduce_result_type
     { typedef typename adaptor_type::deduce_result_type<
@@ -85,7 +87,6 @@
         typename sigc::deduce_result_type<LIST(T_getter2, LOOP(T_arg%1,CALL_SIZE))>::type
           >::type result_type; };
   typedef typename adaptor_type::result_type  result_type;
-  typedef typename adapts<T_setter>::adaptor_type adaptor_type;
 
   result_type
   operator()();