cppunit-cvs

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

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

Modified Files:
	functor.h functor.py 
Log Message:
* fixed bad return statement in void Functor.

Index: functor.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/functor.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** functor.h	28 Feb 2005 20:33:34 -0000	1.4
--- functor.h	4 Mar 2005 22:17:54 -0000	1.5
***************
*** 1250,1254 ****
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       return impl(  );
     }
  
--- 1250,1254 ----
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       impl(  );
     }
  
***************
*** 1338,1342 ****
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       return impl( a1 );
     }
  
--- 1338,1342 ----
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       impl( a1 );
     }
  
***************
*** 1430,1434 ****
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       return impl( a1, a2 );
     }
  
--- 1430,1434 ----
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       impl( a1, a2 );
     }
  
***************
*** 1525,1529 ****
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       return impl( a1, a2, a3 );
     }
  
--- 1525,1529 ----
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       impl( a1, a2, a3 );
     }
  
***************
*** 1622,1626 ****
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       return impl( a1, a2, a3, a4 );
     }
  
--- 1622,1626 ----
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       impl( a1, a2, a3, a4 );
     }
  
***************
*** 1721,1725 ****
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       return impl( a1, a2, a3, a4, a5 );
     }
  
--- 1721,1725 ----
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       impl( a1, a2, a3, a4, a5 );
     }
  

Index: functor.py
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/functor.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** functor.py	28 Feb 2005 20:33:47 -0000	1.4
--- functor.py	4 Mar 2005 22:17:54 -0000	1.5
***************
*** 281,285 ****
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       return impl( %(fn_call)s );
     }
  
--- 281,285 ----
     {
        FunctorImplType &impl = *( static_cast<FunctorImplType *>(impl_) );
!       %(return_keyword)simpl( %(fn_call)s );
     }