[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.25,1.26 CoreMock.h,1.13,1.14
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.25,1.26 CoreMock.h,1.13,1.14 FIFOInvocationDispatcher.h,1.12,1.13 InvocationMocker.h,1.30,1.31 LIFOInvocationDispatcher.h,1.12,1.13 mockpp_pti.h,1.5,1.6
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9425/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h CoreMock.h FIFOInvocationDispatcher.h InvocationMocker.h LIFOInvocationDispatcher.h mockpp_pti.h Log Message: more efforts to make msvc6 compile Index: InvocationMocker.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationMocker.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- InvocationMocker.h 2 Apr 2005 20:45:31 -0000 1.30 +++ InvocationMocker.h 3 Apr 2005 18:32:53 -0000 1.31 @@ -433,6 +433,10 @@ }; +#define MOCKPP_INVOCATIONMOCKER_PTI_IMPL(I) +#define MOCKPP_INVOCATIONMOCKER_PTI_DECL(I) + + #else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness @@ -440,44 +444,42 @@ * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_INVOCATIONMOCKER_PTI_DECL(I) \ -template<> \ -::mockpp::InvocationMocker<void, I >::InvocationMocker<void, I >(); \ -\ -template<> \ -::mockpp::InvocationMocker<void, I >::InvocationMocker<void, I >(\ - ::mockpp::AutoPointer<mockpp::InvocationMockerBase<void, I >::DescriberBase> in_describer ); \ -\ -template<> \ -void ::mockpp::InvocationMocker<void, I >::invoke( const I &invocation ); +namespace mockpp { \ +template<> \ +class InvocationMocker<void, I> : public InvocationMockerBase<void, I>; \ +} /** Implement specialized methods for mockpp::InvocationMocker. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_INVOCATIONMOCKER_PTI_IMPL(I) \ +namespace mockpp { \ template<> \ -::mockpp::InvocationMocker<void, I >::InvocationMocker<void, I >() \ - : InvocationMockerBase<void, I >( new ::mockpp::InvocationMockerBase<void, I >::DefaultDescriber(), \ - new ::mockpp::TypelessStubAdapter<void, I >(new ::mockpp::VoidStub)) \ -{ \ -} \ -\ -template<> \ -mockpp::InvocationMocker<void, I >::InvocationMocker<void, I >(\ - ::mockpp::AutoPointer<mockpp::InvocationMockerBase<void, I >::DescriberBase> in_describer ) \ - : InvocationMockerBase<void, I >( in_describer, \ - new ::mockpp::TypelessStubAdapter<void, I >(new ::mockpp::VoidStub)) \ -{ \ -} \ +class InvocationMocker<void, I> : public InvocationMockerBase<void, I> \ +{ \ + InvocationMocker<void, I >::InvocationMocker<void, I >() \ + : InvocationMockerBase<void, I >( new InvocationMockerBase<void, I >::DefaultDescriber(), \ + new TypelessStubAdapter<void, I >(new VoidStub)) \ + { \ + } \ \ -template<> \ -void ::mockpp::InvocationMocker<void, I >::invoke( const I &invocation ) \ -{ \ - for ( Iterator it = this->matchers.begin(); it != this->matchers.end(); ++it ) \ - ( *it ) ->incInvoked( invocation ); \ - this->stub->invoke( invocation ); \ -} - + mockpp::InvocationMocker<void, I >::InvocationMocker<void, I >(\ + AutoPointer<mockpp::InvocationMockerBase<void, I >::DescriberBase> in_describer ) \ + : InvocationMockerBase<void, I >( in_describer, \ + new TypelessStubAdapter<void, I >(new VoidStub)) \ + { \ + } \ +\ + void InvocationMocker<void, I >::invoke( const I &invocation ) \ + { \ + for ( Iterator it = this->matchers.begin(); it != this->matchers.end(); ++it ) \ + ( *it ) ->incInvoked( invocation ); \ + this->stub->invoke( invocation ); \ + } \ +}; /* class */ \ +} // ns + #endif // MOCKPP_PTI_WEAKNESS Index: LIFOInvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/LIFOInvocationDispatcher.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- LIFOInvocationDispatcher.h 2 Apr 2005 20:45:31 -0000 1.12 +++ LIFOInvocationDispatcher.h 3 Apr 2005 18:32:53 -0000 1.13 @@ -110,6 +110,10 @@ #else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness +#define MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_IMPL(I) +#define MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_DECL(I) + + /** Declare specialized methods for mockpp::LIFOInvocationDispatcher. * Neccessary for compiler with weak template capabilities. */ Index: CoreMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/CoreMock.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- CoreMock.h 2 Apr 2005 20:45:31 -0000 1.13 +++ CoreMock.h 3 Apr 2005 18:32:53 -0000 1.14 @@ -126,6 +126,10 @@ }; +#define MOCKPP_COREMOCK_PTI_IMPL(I) +#define MOCKPP_COREMOCK_PTI_DECL(I) + + #else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness /** Declare specialized methods for mockpp::CoreMock. @@ -133,19 +137,35 @@ */ #define MOCKPP_COREMOCK_PTI_DECL(I) \ template<> \ -void mockpp::CoreMock<void, I >::invoke( const I &invocation ); +void mockpp::CoreMock<void, I >; + /** Implement specialized methods for mockpp::CoreMock. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_COREMOCK_PTI_IMPL(I) \ +namespace mockpp { \ template<> \ -void mockpp::CoreMock<void, I >::invoke( const I &invocation ) \ -{ \ - mockInvocation( invocation ); \ +class CoreMock<void, I> : public AbstractDynamicChainingMock<void, I> \ +{ \ + public: \ + CoreMock<void, I>( InvocationDispatcher<void, I>::AP invocationDispatcher, \ + const String &name, \ + VerifiableList *parent) \ + : AbstractDynamicChainingMock<void, I>( invocationDispatcher, name, parent ) \ + {} \ + \ + CoreMock<void, I>( const String &name, VerifiableList *parent) \ + : AbstractDynamicChainingMock<void, I>( name, parent) \ + {} \ + \ + void mockpp::CoreMock<void, I >::invoke( const I &invocation ) \ + { \ + mockInvocation( invocation ); \ + } \ +}; \ } - #endif Index: mockpp_pti.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/mockpp_pti.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mockpp_pti.h 26 Mar 2005 20:11:33 -0000 1.5 +++ mockpp_pti.h 3 Apr 2005 18:32:53 -0000 1.6 @@ -40,11 +40,7 @@ #include <mockpp/chaining/CoreMock.h> #include <mockpp/chaining/InvocationMocker.h> #include <mockpp/chaining/AbstractDynamicChainingMock.h> -#include <mockpp/stub/ThrowStub.h> -#include <mockpp/stub/TypelessStub.h> -#define MOCKPP_PTI_IMPLEMENT_BASICS \ - MOCKPP_THROWSTUB_PTI_IMPL #define MOCKPP_PTI_IMPLEMENT(I) \ MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(I) \ @@ -55,7 +51,6 @@ MOCKPP_COREMOCK_PTI_IMPL(I) #define MOCKPP_PTI_DECLARE(I) \ - MOCKPP_THROWSTUB_PTI_DECL \ MOCKPP_TYPELESSSTUBADAPTER_PTI_DECL(I) \ MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_DECL(I) \ MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_DECL(I) \ Index: FIFOInvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/FIFOInvocationDispatcher.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- FIFOInvocationDispatcher.h 2 Apr 2005 20:45:31 -0000 1.12 +++ FIFOInvocationDispatcher.h 3 Apr 2005 18:32:53 -0000 1.13 @@ -107,6 +107,10 @@ }; +#define MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_IMPL(I) +#define MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_DECL(I) + + #else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- AbstractDynamicChainingMock.h 3 Apr 2005 12:01:38 -0000 1.25 +++ AbstractDynamicChainingMock.h 3 Apr 2005 18:32:46 -0000 1.26 @@ -96,7 +96,8 @@ #define MOCKPP_NEED_USING #endif -#if defined(_MSC_VER) +#if defined(_MSC_VER_123) + /** Appends the description of this object to the buffer. * @param result The buffer that the description is appended to. * @param matchers list of matcher objects @@ -119,7 +120,7 @@ #endif #ifdef MOCKPP_NEED_USING - using InvocationMocker<R, I>::DescriberBase::describeTo; // use only once + using InvocationMocker<R, I>::DescriberBase::describeTo; // use only once #endif #undef MOCKPP_NEED_USING @@ -343,6 +344,10 @@ }; +#define MOCKPP_ABSTRACTDYNAMICCHAININGMOCK_PTI_IMPL(I) +#define MOCKPP_ABSTRACTDYNAMICCHAININGMOCK_PTI_DECL(I) + + #else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness |
