[Mockpp-commits] mockpp/mockpp/chaining InvocationMocker.h,1.28,1.29
Brought to you by:
ewald-arnold
From: Ewald A. <ewa...@us...> - 2005-04-02 13:47:10
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31668/mockpp/chaining Modified Files: InvocationMocker.h Log Message: fixes for cygwin (unicode+ascii) Index: InvocationMocker.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationMocker.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- InvocationMocker.h 25 Mar 2005 16:30:29 -0000 1.28 +++ InvocationMocker.h 2 Apr 2005 13:46:29 -0000 1.29 @@ -441,14 +441,14 @@ */ #define MOCKPP_INVOCATIONMOCKER_PTI_DECL(I) \ template<> \ -mockpp::InvocationMocker<void, I>::InvocationMocker<void, I>(); \ +::mockpp::InvocationMocker<void, I>::InvocationMocker<void, I>(); \ \ template<> \ -mockpp::InvocationMocker<void, I>::InvocationMocker<void, I>(\ - mockpp::AutoPointer<mockpp::InvocationMockerBase<void, I>::DescriberBase> in_describer ); \ +::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 ); +void ::mockpp::InvocationMocker<void, I>::invoke( const I &invocation ); /** Implement specialized methods for mockpp::InvocationMocker. @@ -456,22 +456,22 @@ */ #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)) \ +::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 ) \ + ::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 ) \ +void ::mockpp::InvocationMocker<void, I>::invoke( const I &invocation ) \ { \ for ( Iterator it = this->matchers.begin(); it != this->matchers.end(); ++it ) \ ( *it ) ->incInvoked( invocation ); \ |