[Cppunit-cvs] cppunit2/include/cpput enumerator.h,1.8,1.9 equality.h,1.2,1.3 forwards.h,1.8,1.9 func
Brought to you by:
blep
Update of /cvsroot/cppunit/cppunit2/include/cpput In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18930/include/cpput Modified Files: enumerator.h equality.h forwards.h functor.h parametrizedsource.h resource.h tablefixture.h testcase.h testfixture.h thread.h Log Message: * moved CppUT::SmartPtr to CppTL::SharedPtr * moved CppUT::AtomicCounter to CppTL::AtomicCounter and inlined implementation Index: testcase.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/testcase.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** testcase.h 23 Jun 2004 18:45:36 -0000 1.3 --- testcase.h 17 Nov 2004 08:59:05 -0000 1.4 *************** *** 6,10 **** # include <cpput/functor.h> # include <cpput/test.h> ! # include <cpput/smartptr.h> # include <string> --- 6,10 ---- # include <cpput/functor.h> # include <cpput/test.h> ! # include <cpptl/sharedptr.h> # include <string> *************** *** 74,78 **** template<typename FixtureType> ! TestPtr makeFixtureTestCase( const SmartPtr<FixtureType> &fixture, const Functor0 &run, const std::string &name ) --- 74,78 ---- template<typename FixtureType> ! TestPtr makeFixtureTestCase( const CppTL::SharedPtr<FixtureType> &fixture, const Functor0 &run, const std::string &name ) Index: parametrizedsource.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/parametrizedsource.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** parametrizedsource.h 1 Feb 2004 16:12:51 -0000 1.3 --- parametrizedsource.h 17 Nov 2004 08:59:05 -0000 1.4 *************** *** 4,8 **** # include <cpput/config.h> # include <cpput/testcase.h> ! # include <cpput/smartptr.h> # include <map> # include <stdexcept> --- 4,8 ---- # include <cpput/config.h> # include <cpput/testcase.h> ! # include <cpptl/sharedptr.h> # include <map> # include <stdexcept> *************** *** 20,24 **** ! typedef SmartPtr<ParameterNode> ParameterNodePtr; --- 20,24 ---- ! typedef CppTL::SharedPtr<ParameterNode> ParameterNodePtr; *************** *** 55,59 **** }; ! typedef SmartPtr<TestParameterFactory> TestParameterFactoryPtr; typedef FunctorR1<TestParameterFactoryPtr, std::string> SuiteParameterFactory; --- 55,59 ---- }; ! typedef CppTL::SharedPtr<TestParameterFactory> TestParameterFactoryPtr; typedef FunctorR1<TestParameterFactoryPtr, std::string> SuiteParameterFactory; Index: forwards.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/forwards.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** forwards.h 15 Nov 2004 08:25:39 -0000 1.8 --- forwards.h 17 Nov 2004 08:59:05 -0000 1.9 *************** *** 2,6 **** # define CPPUT_FORWARDS_H_INCLUDED ! # include <cpput/smartptr.h> # include <string> --- 2,7 ---- # define CPPUT_FORWARDS_H_INCLUDED ! # include <cpput/config.h> ! # include <cpptl/sharedptr.h> # include <string> *************** *** 27,34 **** class TestVisitor; ! typedef SmartPtr<Test> TestPtr; ! typedef SmartPtr<TestExceptionGuard> TestExceptionGuardPtr; ! typedef SmartPtr<AbstractTestSuite> AbstractTestSuitePtr; ! typedef SmartPtr<TestSuite> TestSuitePtr; --- 28,35 ---- class TestVisitor; ! typedef CppTL::SharedPtr<Test> TestPtr; ! typedef CppTL::SharedPtr<TestExceptionGuard> TestExceptionGuardPtr; ! typedef CppTL::SharedPtr<AbstractTestSuite> AbstractTestSuitePtr; ! typedef CppTL::SharedPtr<TestSuite> TestSuitePtr; Index: equality.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/equality.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** equality.h 1 Feb 2004 10:22:02 -0000 1.2 --- equality.h 17 Nov 2004 08:59:05 -0000 1.3 *************** *** 2,6 **** # define CPPUT_EQUALITY_H_INCLUDED ! # include <cpput/smartptr.h> # ifndef CPPUT_NO_DEFAULT_EQUALITY --- 2,6 ---- # define CPPUT_EQUALITY_H_INCLUDED ! # include <cpptl/sharedptr.h> # ifndef CPPUT_NO_DEFAULT_EQUALITY *************** *** 39,43 **** template<typename AType, typename BType> ! bool equalityTest( const SmartPtr<AType> &a, const SmartPtr<BType> &b ) { return a.get() == b.get() || ( a.get() && b.get() && equalityTest( *a, *b ) ); --- 39,43 ---- template<typename AType, typename BType> ! bool equalityTest( const CppTL::SharedPtr<AType> &a, const CppTL::SharedPtr<BType> &b ) { return a.get() == b.get() || ( a.get() && b.get() && equalityTest( *a, *b ) ); Index: enumerator.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/enumerator.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** enumerator.h 21 Oct 2004 17:23:23 -0000 1.8 --- enumerator.h 17 Nov 2004 08:59:05 -0000 1.9 *************** *** 3,7 **** # include <cpput/config.h> ! # include <cpput/smartptr.h> # include <deque> # include <iterator> --- 3,7 ---- # include <cpput/config.h> ! # include <cpptl/sharedptr.h> # include <deque> # include <iterator> *************** *** 44,48 **** public: typedef AEnumeratedType EnumeratedType; ! typedef SmartPtr<EnumeratorImpl<EnumeratedType> > Ptr; virtual EnumeratedType getNext() =0; --- 44,48 ---- public: typedef AEnumeratedType EnumeratedType; ! typedef CppTL::SharedPtr<EnumeratorImpl<EnumeratedType> > Ptr; virtual EnumeratedType getNext() =0; Index: testfixture.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/testfixture.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** testfixture.h 15 Nov 2004 08:28:51 -0000 1.4 --- testfixture.h 17 Nov 2004 08:59:05 -0000 1.5 *************** *** 2,6 **** # define CPPUT_TESTFIXTURE_H_INCLUDED ! # include <cpput/config.h> # include <cpput/testcase.h> # include <cpput/testsuite.h> --- 2,6 ---- # define CPPUT_TESTFIXTURE_H_INCLUDED ! # include <cpput/forwards.h> # include <cpput/testcase.h> # include <cpput/testsuite.h> *************** *** 31,35 **** namespace Impl { ! typedef SmartPtr<TestFixture> TestFixturePtr; class CPPUT_API FixtureFactory --- 31,35 ---- namespace Impl { ! typedef CppTL::SharedPtr<TestFixture> TestFixturePtr; class CPPUT_API FixtureFactory *************** *** 100,106 **** } ! CPPUT_DEDUCED_TYPENAME SmartPtr<FixtureType> operator()() { ! return ::CppUT::staticPointerCast<FixtureType>( factory_() ); } --- 100,106 ---- } ! CPPUT_DEDUCED_TYPENAME CppTL::SharedPtr<FixtureType> operator()() { ! return ::CppTL::staticPointerCast<FixtureType>( factory_() ); } *************** *** 127,131 **** { ::CppUT::Impl::FixtureFactoryWrapper<CppUT_ThisType> fixtureFactory( factory_ ); ! ::SmartPtr<FixtureType> fixture; // CPPUT_TESTSUITE_EXTEND (if defined) --- 127,131 ---- { ::CppUT::Impl::FixtureFactoryWrapper<CppUT_ThisType> fixtureFactory( factory_ ); ! ::CppTL::SharedPtr<FixtureType> fixture; // CPPUT_TESTSUITE_EXTEND (if defined) *************** *** 179,183 **** ::CppUT::Impl::FixtureFactoryWrapper<CppUT_ThisType> fixtureFactory( \ factory_ ); \ ! ::CppUT::SmartPtr<FixtureType> fixture # define CPPUT_TESTSUITE_EXTEND( FixtureType, ParentFixtureType ) \ --- 179,183 ---- ::CppUT::Impl::FixtureFactoryWrapper<CppUT_ThisType> fixtureFactory( \ factory_ ); \ ! ::CppTL::SharedPtr<FixtureType> fixture # define CPPUT_TESTSUITE_EXTEND( FixtureType, ParentFixtureType ) \ *************** *** 195,199 **** ::CppUT::Impl::FixtureFactoryImpl<CppUT_ThisType> factory; \ addTests_( testSuite, factory ); \ ! return ::CppUT::staticPointerCast< ::CppUT::Test >( testSuite ); \ } --- 195,199 ---- ::CppUT::Impl::FixtureFactoryImpl<CppUT_ThisType> factory; \ addTests_( testSuite, factory ); \ ! return ::CppTL::staticPointerCast< ::CppUT::Test >( testSuite ); \ } Index: thread.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/thread.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** thread.h 7 Feb 2004 21:50:57 -0000 1.7 --- thread.h 17 Nov 2004 08:59:05 -0000 1.8 *************** *** 209,213 **** class Thread; ! typedef SmartPtr<Thread> ThreadPtr; inline ThreadPtr createThread( Functor0 threadFunction ) --- 209,213 ---- class Thread; ! typedef CppTL::SharedPtr<Thread> ThreadPtr; inline ThreadPtr createThread( Functor0 threadFunction ) Index: resource.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/resource.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** resource.h 21 Oct 2004 17:21:20 -0000 1.2 --- resource.h 17 Nov 2004 08:59:05 -0000 1.3 *************** *** 2,6 **** # define CPPUT_RESOURCE_H_INCLUDED ! # include <cpput/smartptr.h> /* --- 2,6 ---- # define CPPUT_RESOURCE_H_INCLUDED ! # include <cpptl/sharedptr.h> /* *************** *** 17,21 **** class Resource; ! typedef SmartPtr<Resource> ResourcePtr; class CPPUT_API Resource --- 17,21 ---- class Resource; ! typedef CppTL::SharedPtr<Resource> ResourcePtr; class CPPUT_API Resource Index: functor.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/functor.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** functor.h 1 Feb 2004 16:12:51 -0000 1.4 --- functor.h 17 Nov 2004 08:59:05 -0000 1.5 *************** *** 4,8 **** // File generated using functor.py. DO NOT EDIT. ! # include <cpput/smartptr.h> namespace CppUT { --- 4,8 ---- // File generated using functor.py. DO NOT EDIT. ! # include <cpptl/sharedptr.h> namespace CppUT { *************** *** 485,489 **** private: ! SmartPtr< Impl::Functor0Base<void> > impl_; }; --- 485,489 ---- private: ! CppTL::SharedPtr< Impl::Functor0Base<void> > impl_; }; *************** *** 515,519 **** private: ! CPPUT_DEDUCED_TYPENAME SmartPtr< Impl::Functor0Base<ReturnType> > impl_; }; --- 515,519 ---- private: ! CPPUT_DEDUCED_TYPENAME CppTL::SharedPtr< Impl::Functor0Base<ReturnType> > impl_; }; *************** *** 548,552 **** private: ! CPPUT_DEDUCED_TYPENAME SmartPtr< Impl::Functor1Base<void, Arg1Type> > impl_; }; --- 548,552 ---- private: ! CPPUT_DEDUCED_TYPENAME CppTL::SharedPtr< Impl::Functor1Base<void, Arg1Type> > impl_; }; *************** *** 579,583 **** private: ! CPPUT_DEDUCED_TYPENAME SmartPtr< Impl::Functor1Base<ReturnType, Arg1Type> > impl_; }; --- 579,583 ---- private: ! CPPUT_DEDUCED_TYPENAME CppTL::SharedPtr< Impl::Functor1Base<ReturnType, Arg1Type> > impl_; }; *************** *** 613,617 **** private: ! CPPUT_DEDUCED_TYPENAME SmartPtr< Impl::Functor2Base<void, Arg1Type, Arg2Type> > impl_; }; --- 613,617 ---- private: ! CPPUT_DEDUCED_TYPENAME CppTL::SharedPtr< Impl::Functor2Base<void, Arg1Type, Arg2Type> > impl_; }; *************** *** 645,649 **** private: ! CPPUT_DEDUCED_TYPENAME SmartPtr< Impl::Functor2Base<ReturnType, Arg1Type, Arg2Type> > impl_; }; --- 645,649 ---- private: ! CPPUT_DEDUCED_TYPENAME CppTL::SharedPtr< Impl::Functor2Base<ReturnType, Arg1Type, Arg2Type> > impl_; }; *************** *** 693,700 **** template<class ObjectType> Functor0 ! makeMemFn0( SmartPtr<ObjectType> object, void (ObjectType::*method)() ) { ! return makeFn0( Impl::MemFn0< ObjectType, SmartPtr<ObjectType> >( object, method ) ); } --- 693,700 ---- template<class ObjectType> Functor0 ! makeMemFn0( CppTL::SharedPtr<ObjectType> object, void (ObjectType::*method)() ) { ! return makeFn0( Impl::MemFn0< ObjectType, CppTL::SharedPtr<ObjectType> >( object, method ) ); } *************** *** 709,716 **** template<class ReturnType, class ObjectType> FunctorR0<ReturnType> ! makeMemFnR0( SmartPtr<ObjectType> object, ReturnType (ObjectType::*method)() ) { ! return makeFnR0<ReturnType>( Impl::MemFnR0< ObjectType, SmartPtr<ObjectType>, ReturnType >( object, method ) ); } --- 709,716 ---- template<class ReturnType, class ObjectType> FunctorR0<ReturnType> ! makeMemFnR0( CppTL::SharedPtr<ObjectType> object, ReturnType (ObjectType::*method)() ) { ! return makeFnR0<ReturnType>( Impl::MemFnR0< ObjectType, CppTL::SharedPtr<ObjectType>, ReturnType >( object, method ) ); } *************** *** 765,772 **** template<class ObjectType, class Arg1Type> Functor1<Arg1Type> ! makeMemFn1( SmartPtr<ObjectType> object, void (ObjectType::*method)(Arg1Type arg1) ) { ! return makeFn1( Impl::MemFn1< ObjectType, SmartPtr<ObjectType>, Arg1Type >( object, method ) ); } --- 765,772 ---- template<class ObjectType, class Arg1Type> Functor1<Arg1Type> ! makeMemFn1( CppTL::SharedPtr<ObjectType> object, void (ObjectType::*method)(Arg1Type arg1) ) { ! return makeFn1( Impl::MemFn1< ObjectType, CppTL::SharedPtr<ObjectType>, Arg1Type >( object, method ) ); } *************** *** 781,788 **** template<class ReturnType, class ObjectType, class Arg1Type> FunctorR1<ReturnType, Arg1Type> ! makeMemFnR1( SmartPtr<ObjectType> object, ReturnType (ObjectType::*method)(Arg1Type arg1) ) { ! return makeFnR1<ReturnType>( Impl::MemFnR1< ObjectType, SmartPtr<ObjectType>, ReturnType, Arg1Type >( object, method ) ); } --- 781,788 ---- template<class ReturnType, class ObjectType, class Arg1Type> FunctorR1<ReturnType, Arg1Type> ! makeMemFnR1( CppTL::SharedPtr<ObjectType> object, ReturnType (ObjectType::*method)(Arg1Type arg1) ) { ! return makeFnR1<ReturnType>( Impl::MemFnR1< ObjectType, CppTL::SharedPtr<ObjectType>, ReturnType, Arg1Type >( object, method ) ); } *************** *** 861,868 **** template<class ObjectType, class Arg1Type, class Arg2Type> Functor2<Arg1Type, Arg2Type> ! makeMemFn2( SmartPtr<ObjectType> object, void (ObjectType::*method)(Arg1Type arg1, Arg2Type arg2) ) { ! return makeFn2( Impl::MemFn2< ObjectType, SmartPtr<ObjectType>, Arg1Type, Arg2Type >( object, method ) ); } --- 861,868 ---- template<class ObjectType, class Arg1Type, class Arg2Type> Functor2<Arg1Type, Arg2Type> ! makeMemFn2( CppTL::SharedPtr<ObjectType> object, void (ObjectType::*method)(Arg1Type arg1, Arg2Type arg2) ) { ! return makeFn2( Impl::MemFn2< ObjectType, CppTL::SharedPtr<ObjectType>, Arg1Type, Arg2Type >( object, method ) ); } *************** *** 877,884 **** template<class ReturnType, class ObjectType, class Arg1Type, class Arg2Type> FunctorR2<ReturnType, Arg1Type, Arg2Type> ! makeMemFnR2( SmartPtr<ObjectType> object, ReturnType (ObjectType::*method)(Arg1Type arg1, Arg2Type arg2) ) { ! return makeFnR2<ReturnType>( Impl::MemFnR2< ObjectType, SmartPtr<ObjectType>, ReturnType, Arg1Type, Arg2Type >( object, method ) ); } --- 877,884 ---- template<class ReturnType, class ObjectType, class Arg1Type, class Arg2Type> FunctorR2<ReturnType, Arg1Type, Arg2Type> ! makeMemFnR2( CppTL::SharedPtr<ObjectType> object, ReturnType (ObjectType::*method)(Arg1Type arg1, Arg2Type arg2) ) { ! return makeFnR2<ReturnType>( Impl::MemFnR2< ObjectType, CppTL::SharedPtr<ObjectType>, ReturnType, Arg1Type, Arg2Type >( object, method ) ); } Index: tablefixture.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/tablefixture.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tablefixture.h 15 Jun 2004 01:19:17 -0000 1.1 --- tablefixture.h 17 Nov 2004 08:59:05 -0000 1.2 *************** *** 10,14 **** class TableFixture; class TableRow; ! typedef SmartPtr<CellBinder> CellBinderPtr; class Table --- 10,14 ---- class TableFixture; class TableRow; ! typedef CppTL::SharedPtr<CellBinder> CellBinderPtr; class Table |