[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.22,1.23 CoreMock.h,1.11,1.12
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.22,1.23 CoreMock.h,1.11,1.12 FIFOInvocationDispatcher.h,1.10,1.11 InvocationMocker.h,1.27,1.28 LIFOInvocationDispatcher.h,1.10,1.11 mockpp_pti.h,1.2,1.3
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11523/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h CoreMock.h FIFOInvocationDispatcher.h InvocationMocker.h LIFOInvocationDispatcher.h mockpp_pti.h Log Message: work on support for weak compilers Index: InvocationMocker.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationMocker.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- InvocationMocker.h 22 Mar 2005 22:03:23 -0000 1.27 +++ InvocationMocker.h 25 Mar 2005 16:30:29 -0000 1.28 @@ -385,7 +385,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Partial specialisation for helper objects to mock void invocations. @@ -433,17 +433,21 @@ }; -#else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness +#else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness + /** Declare specialized methods for mockpp::InvocationMocker. * 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 ); @@ -451,19 +455,22 @@ * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_INVOCATIONMOCKER_PTI_IMPL(I) \ +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)) \ + new mockpp::TypelessStubAdapter<void, I>(new mockpp::VoidStub)) \ { \ } \ \ +template<> \ void mockpp::InvocationMocker<void, I>::invoke( const I &invocation ) \ { \ for ( Iterator it = this->matchers.begin(); it != this->matchers.end(); ++it ) \ Index: LIFOInvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/LIFOInvocationDispatcher.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- LIFOInvocationDispatcher.h 11 Mar 2005 00:24:55 -0000 1.10 +++ LIFOInvocationDispatcher.h 25 Mar 2005 16:30:29 -0000 1.11 @@ -73,7 +73,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Partial specialisation to dispatch void invokables Last-In-First-Out @@ -107,19 +107,21 @@ }; -#else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness +#else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness /** Declare specialized methods for mockpp::LIFOInvocationDispatcher. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_DECL(I) \ +template<> \ void mockpp::LIFOInvocationDispatcher<void, I>::dispatch( const I &invocation ); /** Implement specialized methods for mockpp::LIFOInvocationDispatcher. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_IMPL(I) \ +template<> \ void mockpp::LIFOInvocationDispatcher<void, I>::dispatch( const I &invocation ) \ { \ Iterator it = this->invokables.rbegin(); \ Index: CoreMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/CoreMock.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- CoreMock.h 23 Jan 2005 21:18:57 -0000 1.11 +++ CoreMock.h 25 Mar 2005 16:30:29 -0000 1.12 @@ -84,7 +84,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Partial specialisation of a helper chaining mock for void methods. @@ -126,18 +126,20 @@ }; -#else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness +#else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness /** Declare specialized methods for mockpp::CoreMock. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_COREMOCK_PTI_DECL(I) \ +template<> \ void mockpp::CoreMock<void, I>::invoke( const I &invocation ); /** Implement specialized methods for mockpp::CoreMock. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_COREMOCK_PTI_IMPL(I) \ +template<> \ void mockpp::CoreMock<void, I>::invoke( const I &invocation ) \ { \ mockInvocation( invocation ); \ Index: mockpp_pti.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/mockpp_pti.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mockpp_pti.h 15 Jan 2005 12:22:26 -0000 1.2 +++ mockpp_pti.h 25 Mar 2005 16:30:29 -0000 1.3 @@ -31,7 +31,7 @@ #define MOCKPP_PTI_H -#ifdef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifdef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness #include <mockpp/mockpp.h> @@ -39,13 +39,15 @@ #include <mockpp/chaining/FIFOInvocationDispatcher.h> #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> +#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_THROWSTUB_PTI_IMPL(I) \ - MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(I) \ + MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(I) \ MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_IMPL(I) \ MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_IMPL(I) \ MOCKPP_INVOCATIONMOCKER_PTI_IMPL(I) \ @@ -53,8 +55,8 @@ MOCKPP_COREMOCK_PTI_IMPL(I) #define MOCKPP_PTI_DECLARE(I) \ - MOCKPP_THROWSTUB_PTI_DECL(I) \ - MOCKPP_TYPELESSSTUBADAPTER_PTI_DECL(I) \ + MOCKPP_THROWSTUB_PTI_DECL \ + MOCKPP_TYPELESSSTUBADAPTER_PTI_DECL(I) \ MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_DECL(I) \ MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_DECL(I) \ MOCKPP_INVOCATIONMOCKER_PTI_DECL(I) \ Index: FIFOInvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/FIFOInvocationDispatcher.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- FIFOInvocationDispatcher.h 11 Mar 2005 00:24:55 -0000 1.10 +++ FIFOInvocationDispatcher.h 25 Mar 2005 16:30:29 -0000 1.11 @@ -73,7 +73,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Partial specialisation to dispatch void invokables First-In-First-Out @@ -107,19 +107,21 @@ }; -#else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness +#else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness /** Declare specialized methods for mockpp::FIFOInvocationDispatcher. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_DECL(I) \ +template<> \ void mockpp::FIFOInvocationDispatcher<void, I>::dispatch( const I &invocation ); /** Implement specialized methods for mockpp::FIFOInvocationDispatcher. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_IMPL(I) \ +template<> \ void mockpp::FIFOInvocationDispatcher<void, I>::dispatch( const I &invocation ) \ { \ Iterator it = this->invokables.begin(); \ Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- AbstractDynamicChainingMock.h 11 Mar 2005 00:24:55 -0000 1.22 +++ AbstractDynamicChainingMock.h 25 Mar 2005 16:30:28 -0000 1.23 @@ -256,7 +256,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Partial specialisation of a chaining mock for void methods. @@ -315,19 +315,21 @@ }; -#else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness +#else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness /** Declare specialized methods for mockpp::AbstractDynamicChainingMock. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_ABSTRACTDYNAMICCHAININGMOCK_PTI_DECL(I) \ +template<> \ void mockpp::AbstractDynamicChainingMock<void, I>::mockInvocation( const I &invocation ); /** Implement specialized methods for mockpp::AbstractDynamicChainingMock. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_ABSTRACTDYNAMICCHAININGMOCK_PTI_IMPL(I) \ +template<> \ void mockpp::AbstractDynamicChainingMock<void, I>::mockInvocation( const I &invocation ) \ { \ if ( this->failure.get() != 0 ) \ |
