[Mockpp-commits] mockpp/mockpp/tests AbstractDynamicChainingMock_test.cpp,1.42,1.43 InvocationMocker
Brought to you by:
ewald-arnold
From: Ewald A. <ewa...@us...> - 2006-04-26 20:43:12
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp InvocationMockerBuilder_test.cpp mockpp_pti_test.cpp Log Message: renamed a number of internal variables to avoid warning messages Index: InvocationMockerBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMockerBuilder_test.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- InvocationMockerBuilder_test.cpp 15 Mar 2006 21:34:08 -0000 1.38 +++ InvocationMockerBuilder_test.cpp 26 Apr 2006 20:43:07 -0000 1.39 @@ -125,9 +125,9 @@ typedef typename AMB::InvocationType I; typedef typename AMB::ConstraintSetType CS; - InvocationMockerBuilderDummy( MOCKPP_NS::StubMatchersCollection<R, I> *mocker, - MOCKPP_NS::BuilderNamespace *builderNamespace ) - : MOCKPP_NS::InvocationMockerBuilder<AMB>( mocker, builderNamespace ) + InvocationMockerBuilderDummy( MOCKPP_NS::StubMatchersCollection<R, I> *in_mocker, + MOCKPP_NS::BuilderNamespace *in_builderNamespace ) + : MOCKPP_NS::InvocationMockerBuilder<AMB>( in_mocker, in_builderNamespace ) {} #if defined( __BORLANDC__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- AbstractDynamicChainingMock_test.cpp 15 Mar 2006 21:34:08 -0000 1.42 +++ AbstractDynamicChainingMock_test.cpp 26 Apr 2006 20:43:07 -0000 1.43 @@ -122,10 +122,10 @@ { public: - ChainingMockDummy( typename MOCKPP_NS::InvocationDispatcher<R, I>::AP invocationDispatcher, + ChainingMockDummy( typename MOCKPP_NS::InvocationDispatcher<R, I>::AP in_invocationDispatcher, const MOCKPP_NS::String &name, MOCKPP_NS::VerifiableList *parent ) - : MOCKPP_NS::AbstractDynamicChainingMock<R,I>(invocationDispatcher, name, parent) + : MOCKPP_NS::AbstractDynamicChainingMock<R,I>(in_invocationDispatcher, name, parent) {} R invoke(const I &invocation) Index: mockpp_pti_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_pti_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- mockpp_pti_test.cpp 15 Mar 2006 21:34:08 -0000 1.18 +++ mockpp_pti_test.cpp 26 Apr 2006 20:43:07 -0000 1.19 @@ -343,10 +343,10 @@ { public: - ChainingMockDummy( MOCKPP_NS::InvocationDispatcher<void, Setter1Invocation>::AP invocationDispatcher, + ChainingMockDummy( MOCKPP_NS::InvocationDispatcher<void, Setter1Invocation>::AP in_invocationDispatcher, const MOCKPP_NS::String &name, MOCKPP_NS::VerifiableList *parent ) - : MOCKPP_NS::AbstractDynamicChainingMock<void, Setter1Invocation>(invocationDispatcher, name, parent) + : MOCKPP_NS::AbstractDynamicChainingMock<void, Setter1Invocation>(in_invocationDispatcher, name, parent) {} void invoke(const Setter1Invocation &invocation) |