[Cppunit-cvs] cppunit2/include/cpptl functor.h,1.3,1.4 functor.py,1.3,1.4

[Baptiste L. <bl...@us...>]

Update of /cvsroot/cppunit/cppunit2/include/cpptl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32625/include/cpptl

Modified Files:
	functor.h functor.py 
Log Message:
* allow up to 5 arguments.

Index: functor.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/functor.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** functor.h	27 Feb 2005 14:38:25 -0000	1.3
--- functor.h	28 Feb 2005 20:33:34 -0000	1.4
***************
*** 595,598 ****
--- 595,1162 ----
  
     
+    template< class Arg1, class Arg2, class Arg3 >
+    class FunctorBase3 : public FunctorBase
+    {
+    public:
+       virtual void operator()( Arg1 a1, Arg2 a2, Arg3 a3 ) const = 0;
+    };
+ 
[...1279 lines suppressed...]
+ }
+ 
+ template< class Return, class Arg1, class Arg2, class Arg3, class Arg4, class Arg5, class FA1, class FA2, class FA3, class FA4, class FA5 >
+ inline Functor0R<Return>
+ bind_cfnr( Return (*function)( FA1, FA2, FA3, FA4, FA5 ), Arg1 a1, Arg2 a2, Arg3 a3, Arg4 a4, Arg5 a5 )
+ {
+     return fn0r( bind1r( bind2r( bind3r( bind4r( bind5r( cfn5r( function ), a5 ), a4 ), a3 ), a2 ), a1 ) );
+ }
+ 
+ template< class Holder, class Object, class Return, class Arg1, class Arg2, class Arg3, class Arg4, class Arg5, class FA1, class FA2, class FA3, class FA4, class FA5 >
+ inline  Functor0R<Return>
+ bind_memfnr( const Holder &holder,
+              Return (Object::*member)( FA1, FA2, FA3, FA4, FA5 ),
+              Arg1 a1, Arg2 a2, Arg3 a3, Arg4 a4, Arg5 a5 )
+ {
+     return fn0r( bind1r( bind2r( bind3r( bind4r( bind5r( memfn5r( holder, member ), a5 ), a4 ), a3 ), a2 ), a1 ) );
+ }
+ 
  
  

Index: functor.py
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/functor.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** functor.py	27 Feb 2005 14:38:25 -0000	1.3
--- functor.py	28 Feb 2005 20:33:47 -0000	1.4
***************
*** 1,5 ****
  # script to generate cpptl/functor.h
  
! MAX_ARGUMENT_COUNT = 2
  
  header =\
--- 1,5 ----
  # script to generate cpptl/functor.h
  
! MAX_ARGUMENT_COUNT = 5
  
  header =\