[Mockpp-commits] mockpp/mockpp/chaining ChainableMockMethod0.h,1.10,1.11 ChainableMockMethod1.h,1.10
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/chaining ChainableMockMethod0.h,1.10,1.11 ChainableMockMethod1.h,1.10,1.11 ChainableMockMethod2.h,1.10,1.11 ChainableMockMethod3.h,1.10,1.11 ChainableMockMethod4.h,1.10,1.11 ChainableMockMethod5.h,1.10,1.11 ChainableMockMethod6.h,1.8,1.9 ChainableMockMethod.h,1.11,1.12 gen_chainablemethod_N.pl,1.7,1.8
|
From: Ewald A. <ewa...@us...> - 2005-11-24 19:17:17
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2806/mockpp/chaining Modified Files: ChainableMockMethod0.h ChainableMockMethod1.h ChainableMockMethod2.h ChainableMockMethod3.h ChainableMockMethod4.h ChainableMockMethod5.h ChainableMockMethod6.h ChainableMockMethod.h gen_chainablemethod_N.pl Log Message: remove superfluous template parameter Index: ChainableMockMethod6.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod6.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChainableMockMethod6.h 19 Nov 2005 09:18:40 -0000 1.8 +++ ChainableMockMethod6.h 24 Nov 2005 19:17:09 -0000 1.9 @@ -46,7 +46,7 @@ */ template <typename RT, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6> class ChainableMockMethod6Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder6<RT, Invocation6<P1, P2, P3, P4, P5, P6> > > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod6Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { Index: ChainableMockMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChainableMockMethod.h 18 Nov 2005 10:19:35 -0000 1.11 +++ ChainableMockMethod.h 24 Nov 2005 19:17:09 -0000 1.12 @@ -45,7 +45,6 @@ * @ingroup grp_controller * @internal */ -template <typename R> class ChainableMockMethodCommon : public MockObject { public: Index: ChainableMockMethod2.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod2.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockMethod2.h 19 Nov 2005 09:18:40 -0000 1.10 +++ ChainableMockMethod2.h 24 Nov 2005 19:17:09 -0000 1.11 @@ -46,7 +46,7 @@ */ template <typename RT, typename P1, typename P2> class ChainableMockMethod2Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder2<RT, Invocation2<P1, P2> > > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod2Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { Index: ChainableMockMethod3.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod3.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockMethod3.h 19 Nov 2005 09:18:40 -0000 1.10 +++ ChainableMockMethod3.h 24 Nov 2005 19:17:09 -0000 1.11 @@ -46,7 +46,7 @@ */ template <typename RT, typename P1, typename P2, typename P3> class ChainableMockMethod3Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder3<RT, Invocation3<P1, P2, P3> > > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod3Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { Index: ChainableMockMethod4.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod4.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockMethod4.h 19 Nov 2005 09:18:40 -0000 1.10 +++ ChainableMockMethod4.h 24 Nov 2005 19:17:09 -0000 1.11 @@ -46,7 +46,7 @@ */ template <typename RT, typename P1, typename P2, typename P3, typename P4> class ChainableMockMethod4Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder4<RT, Invocation4<P1, P2, P3, P4> > > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod4Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { Index: gen_chainablemethod_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_chainablemethod_N.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- gen_chainablemethod_N.pl 19 Nov 2005 09:18:39 -0000 1.7 +++ gen_chainablemethod_N.pl 24 Nov 2005 19:17:09 -0000 1.8 @@ -172,7 +172,7 @@ */ template <typename RT" . $templateParms_colon . "> class ChainableMockMethod" . $numArgs . "Common - : public ChainableMockMethodCommon<RT>"; + : public ChainableMockMethodCommon"; if ($numArgs > 0) { @@ -213,7 +213,7 @@ * \@param parent parent chainable mock object */ ChainableMockMethod" . $numArgs . "Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR(\"/coreMock\"), this) { Index: ChainableMockMethod5.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod5.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockMethod5.h 19 Nov 2005 09:18:40 -0000 1.10 +++ ChainableMockMethod5.h 24 Nov 2005 19:17:09 -0000 1.11 @@ -46,7 +46,7 @@ */ template <typename RT, typename P1, typename P2, typename P3, typename P4, typename P5> class ChainableMockMethod5Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder5<RT, Invocation5<P1, P2, P3, P4, P5> > > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod5Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { Index: ChainableMockMethod0.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod0.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockMethod0.h 19 Nov 2005 09:18:40 -0000 1.10 +++ ChainableMockMethod0.h 24 Nov 2005 19:17:09 -0000 1.11 @@ -46,7 +46,7 @@ */ template <typename RT> class ChainableMockMethod0Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder0<RT, Invocation0> > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod0Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { Index: ChainableMockMethod1.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod1.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChainableMockMethod1.h 19 Nov 2005 09:18:40 -0000 1.10 +++ ChainableMockMethod1.h 24 Nov 2005 19:17:09 -0000 1.11 @@ -46,7 +46,7 @@ */ template <typename RT, typename P1> class ChainableMockMethod1Common - : public ChainableMockMethodCommon<RT> + : public ChainableMockMethodCommon , public ChainingMockBuilder <ArgumentsMatchBuilder1<RT, Invocation1<P1> > > { public: @@ -63,7 +63,7 @@ * @param parent parent chainable mock object */ ChainableMockMethod1Common(const String &name, ChainableMockObject *parent ) - : ChainableMockMethodCommon<RT>(name, parent) + : ChainableMockMethodCommon(name, parent) , Builder(&coremock, this->getChainableMockObject(), this->getMethodName()) , coremock(name + MOCKPP_PCHAR("/coreMock"), this) { |
