[Cppunit-cvs] cppunit2/src/cpput functor.py,1.3,1.4

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

Update of /cvsroot/cppunit/cppunit2/src/cpput
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26582/src/cpput

Modified Files:
	functor.py 
Log Message:
* fixed generator: should use CPPTL_TYPENAME instead of CPPUT_DEDUCED_TYPENAME

Index: functor.py
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/functor.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** functor.py	17 Nov 2004 08:59:34 -0000	1.3
--- functor.py	23 Feb 2005 21:34:53 -0000	1.4
***************
*** 32,36 ****
      index = 0
      for arg in types.types_pack:
!         print >> out, '%stypedef CPPUT_DEDUCED_TYPENAME FunctorType::%s %s;' % ( indent,
                                                                                   getArgumentTypeName(index),
                                                                                   getArgumentTypeName(index) )
--- 32,36 ----
      index = 0
      for arg in types.types_pack:
!         print >> out, '%stypedef CPPTL_TYPENAME FunctorType::%s %s;' % ( indent,
                                                                                   getArgumentTypeName(index),
                                                                                   getArgumentTypeName(index) )
***************
*** 207,211 ****
      deduced_typename = ''
      if len(types.types) > 0 or has_return_type:
!         deduced_typename = 'CPPUT_DEDUCED_TYPENAME '
      print >> out, """
        explicit %s( %s *impl = 0 )
--- 207,211 ----
      deduced_typename = ''
      if len(types.types) > 0 or has_return_type:
!         deduced_typename = 'CPPTL_TYPENAME '
      print >> out, """
        explicit %s( %s *impl = 0 )
***************
*** 251,255 ****
      template_decl = ', '.join( template_params )
      for index in xrange(0,len(types.types)):
!         arg_type = 'CPPUT_DEDUCED_TYPENAME FunctorType::%s' % getArgumentTypeName(index)
          impl_template_params.append( arg_type )
          functor_type.append( arg_type )
--- 251,255 ----
      template_decl = ', '.join( template_params )
      for index in xrange(0,len(types.types)):
!         arg_type = 'CPPTL_TYPENAME FunctorType::%s' % getArgumentTypeName(index)
          impl_template_params.append( arg_type )
          functor_type.append( arg_type )
***************
*** 318,329 ****
      new_suffix = getSuffix( len(types.types) - 1, has_return_type )
      template_decl = 'class FunctorType, class ArgType'
!     result_type = 'CPPUT_DEDUCED_TYPENAME FunctorType::result_type'
      impl_template_params = result_type + ', FunctorType, ArgType'
      makefn_template_params = ''
      functor_template_params = []
      for index in xrange(0,len(types.types) - 1):
!         functor_template_params.append( 'CPPUT_DEDUCED_TYPENAME FunctorType::%s' % getArgumentTypeName(index) )
      if has_return_type:
!         makefn_template_params = '<CPPUT_DEDUCED_TYPENAME FunctorType::result_type>'
          functor_template_params.insert(0, result_type )
      functor_template_params = ',\n         '.join( functor_template_params )
--- 318,329 ----
      new_suffix = getSuffix( len(types.types) - 1, has_return_type )
      template_decl = 'class FunctorType, class ArgType'
!     result_type = 'CPPTL_TYPENAME FunctorType::result_type'
      impl_template_params = result_type + ', FunctorType, ArgType'
      makefn_template_params = ''
      functor_template_params = []
      for index in xrange(0,len(types.types) - 1):
!         functor_template_params.append( 'CPPTL_TYPENAME FunctorType::%s' % getArgumentTypeName(index) )
      if has_return_type:
!         makefn_template_params = '<CPPTL_TYPENAME FunctorType::result_type>'
          functor_template_params.insert(0, result_type )
      functor_template_params = ',\n         '.join( functor_template_params )