[Cppunit-cvs] cppunit2/include/cpput functor.h,1.5,1.6

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

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

Index: functor.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpput/functor.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** functor.h	17 Nov 2004 08:59:05 -0000	1.5
--- functor.h	23 Feb 2005 21:34:12 -0000	1.6
***************
*** 414,418 ****
        {
        public:
!          typedef CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type first_argument_type;
           typedef void result_type;
  
--- 414,418 ----
        {
        public:
!          typedef CPPTL_TYPENAME FunctorType::first_argument_type first_argument_type;
           typedef void result_type;
  
***************
*** 436,440 ****
        {
        public:
!          typedef CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type first_argument_type;
           typedef ReturnType result_type;
  
--- 436,440 ----
        {
        public:
!          typedef CPPTL_TYPENAME FunctorType::first_argument_type first_argument_type;
           typedef ReturnType result_type;
  
***************
*** 515,519 ****
           
     private:
!       CPPUT_DEDUCED_TYPENAME CppTL::SharedPtr< Impl::Functor0Base<ReturnType> > impl_;
     };
  
--- 515,519 ----
           
     private:
!       CPPTL_TYPENAME CppTL::SharedPtr< Impl::Functor0Base<ReturnType> > impl_;
     };
  
***************
*** 548,552 ****
           
     private:
!       CPPUT_DEDUCED_TYPENAME CppTL::SharedPtr< Impl::Functor1Base<void, Arg1Type> > impl_;
     };
  
--- 548,552 ----
           
     private:
!       CPPTL_TYPENAME CppTL::SharedPtr< Impl::Functor1Base<void, Arg1Type> > impl_;
     };
  
***************
*** 579,583 ****
           
     private:
!       CPPUT_DEDUCED_TYPENAME CppTL::SharedPtr< Impl::Functor1Base<ReturnType, Arg1Type> > impl_;
     };
  
--- 579,583 ----
           
     private:
!       CPPTL_TYPENAME CppTL::SharedPtr< Impl::Functor1Base<ReturnType, Arg1Type> > impl_;
     };
  
***************
*** 613,617 ****
           
     private:
!       CPPUT_DEDUCED_TYPENAME CppTL::SharedPtr< Impl::Functor2Base<void, Arg1Type, Arg2Type> > impl_;
     };
  
--- 613,617 ----
           
     private:
!       CPPTL_TYPENAME CppTL::SharedPtr< Impl::Functor2Base<void, Arg1Type, Arg2Type> > impl_;
     };
  
***************
*** 645,649 ****
           
     private:
!       CPPUT_DEDUCED_TYPENAME CppTL::SharedPtr< Impl::Functor2Base<ReturnType, Arg1Type, Arg2Type> > impl_;
     };
  
--- 645,649 ----
           
     private:
!       CPPTL_TYPENAME CppTL::SharedPtr< Impl::Functor2Base<ReturnType, Arg1Type, Arg2Type> > impl_;
     };
  
***************
*** 717,738 ****
  
     template<class FunctorType>
!    Functor1<CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type>
     makeFn1( FunctorType functor )
     {
!       return Functor1<CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type>(
                  new Impl::Functor1<FunctorType,
!                     CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type>( functor ) );
     }
     
     template<class ReturnType, class FunctorType>
     FunctorR1<ReturnType,
!             CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type>
     makeFnR1( FunctorType functor )
     {
        return FunctorR1<ReturnType,
!             CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type>(
                  new Impl::FunctorR1<FunctorType,
                      ReturnType,
!                     CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type>( functor ) );
     }
     
--- 717,738 ----
  
     template<class FunctorType>
!    Functor1<CPPTL_TYPENAME FunctorType::first_argument_type>
     makeFn1( FunctorType functor )
     {
!       return Functor1<CPPTL_TYPENAME FunctorType::first_argument_type>(
                  new Impl::Functor1<FunctorType,
!                     CPPTL_TYPENAME FunctorType::first_argument_type>( functor ) );
     }
     
     template<class ReturnType, class FunctorType>
     FunctorR1<ReturnType,
!             CPPTL_TYPENAME FunctorType::first_argument_type>
     makeFnR1( FunctorType functor )
     {
        return FunctorR1<ReturnType,
!             CPPTL_TYPENAME FunctorType::first_argument_type>(
                  new Impl::FunctorR1<FunctorType,
                      ReturnType,
!                     CPPTL_TYPENAME FunctorType::first_argument_type>( functor ) );
     }
     
***************
*** 792,805 ****
     {
        return makeFn0(
!                 Impl::Bind1<CPPUT_DEDUCED_TYPENAME FunctorType::result_type, FunctorType, ArgType>(
                           functor, arg ) );
     }
  
     template<class FunctorType, class ArgType>
!    FunctorR0<CPPUT_DEDUCED_TYPENAME FunctorType::result_type>
     bindR1( FunctorType functor, ArgType arg )
     {
!       return makeFnR0<CPPUT_DEDUCED_TYPENAME FunctorType::result_type>(
!                 Impl::BindR1<CPPUT_DEDUCED_TYPENAME FunctorType::result_type, FunctorType, ArgType>(
                           functor, arg ) );
     }
--- 792,805 ----
     {
        return makeFn0(
!                 Impl::Bind1<CPPTL_TYPENAME FunctorType::result_type, FunctorType, ArgType>(
                           functor, arg ) );
     }
  
     template<class FunctorType, class ArgType>
!    FunctorR0<CPPTL_TYPENAME FunctorType::result_type>
     bindR1( FunctorType functor, ArgType arg )
     {
!       return makeFnR0<CPPTL_TYPENAME FunctorType::result_type>(
!                 Impl::BindR1<CPPTL_TYPENAME FunctorType::result_type, FunctorType, ArgType>(
                           functor, arg ) );
     }
***************
*** 807,834 ****
  
     template<class FunctorType>
!    Functor2<CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type,
!             CPPUT_DEDUCED_TYPENAME FunctorType::second_argument_type>
     makeFn2( FunctorType functor )
     {
!       return Functor2<CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type,
!             CPPUT_DEDUCED_TYPENAME FunctorType::second_argument_type>(
                  new Impl::Functor2<FunctorType,
!                     CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type,
!                     CPPUT_DEDUCED_TYPENAME FunctorType::second_argument_type>( functor ) );
     }
     
     template<class ReturnType, class FunctorType>
     FunctorR2<ReturnType,
!             CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type,
!             CPPUT_DEDUCED_TYPENAME FunctorType::second_argument_type>
     makeFnR2( FunctorType functor )
     {
        return FunctorR2<ReturnType,
!             CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type,
!             CPPUT_DEDUCED_TYPENAME FunctorType::second_argument_type>(
                  new Impl::FunctorR2<FunctorType,
                      ReturnType,
!                     CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type,
!                     CPPUT_DEDUCED_TYPENAME FunctorType::second_argument_type>( functor ) );
     }
     
--- 807,834 ----
  
     template<class FunctorType>
!    Functor2<CPPTL_TYPENAME FunctorType::first_argument_type,
!             CPPTL_TYPENAME FunctorType::second_argument_type>
     makeFn2( FunctorType functor )
     {
!       return Functor2<CPPTL_TYPENAME FunctorType::first_argument_type,
!             CPPTL_TYPENAME FunctorType::second_argument_type>(
                  new Impl::Functor2<FunctorType,
!                     CPPTL_TYPENAME FunctorType::first_argument_type,
!                     CPPTL_TYPENAME FunctorType::second_argument_type>( functor ) );
     }
     
     template<class ReturnType, class FunctorType>
     FunctorR2<ReturnType,
!             CPPTL_TYPENAME FunctorType::first_argument_type,
!             CPPTL_TYPENAME FunctorType::second_argument_type>
     makeFnR2( FunctorType functor )
     {
        return FunctorR2<ReturnType,
!             CPPTL_TYPENAME FunctorType::first_argument_type,
!             CPPTL_TYPENAME FunctorType::second_argument_type>(
                  new Impl::FunctorR2<FunctorType,
                      ReturnType,
!                     CPPTL_TYPENAME FunctorType::first_argument_type,
!                     CPPTL_TYPENAME FunctorType::second_argument_type>( functor ) );
     }
     
***************
*** 884,902 ****
     
     template<class FunctorType, class ArgType>
!    Functor1<CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type>
     bind2( FunctorType functor, ArgType arg )
     {
        return makeFn1(
!                 Impl::Bind2<CPPUT_DEDUCED_TYPENAME FunctorType::result_type, FunctorType, ArgType>(
                           functor, arg ) );
     }
  
     template<class FunctorType, class ArgType>
!    FunctorR1<CPPUT_DEDUCED_TYPENAME FunctorType::result_type,
!          CPPUT_DEDUCED_TYPENAME FunctorType::first_argument_type>
     bindR2( FunctorType functor, ArgType arg )
     {
!       return makeFnR1<CPPUT_DEDUCED_TYPENAME FunctorType::result_type>(
!                 Impl::BindR2<CPPUT_DEDUCED_TYPENAME FunctorType::result_type, FunctorType, ArgType>(
                           functor, arg ) );
     }
--- 884,902 ----
     
     template<class FunctorType, class ArgType>
!    Functor1<CPPTL_TYPENAME FunctorType::first_argument_type>
     bind2( FunctorType functor, ArgType arg )
     {
        return makeFn1(
!                 Impl::Bind2<CPPTL_TYPENAME FunctorType::result_type, FunctorType, ArgType>(
                           functor, arg ) );
     }
  
     template<class FunctorType, class ArgType>
!    FunctorR1<CPPTL_TYPENAME FunctorType::result_type,
!          CPPTL_TYPENAME FunctorType::first_argument_type>
     bindR2( FunctorType functor, ArgType arg )
     {
!       return makeFnR1<CPPTL_TYPENAME FunctorType::result_type>(
!                 Impl::BindR2<CPPTL_TYPENAME FunctorType::result_type, FunctorType, ArgType>(
                           functor, arg ) );
     }