[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.35,1.36 AbstractInvocationDi
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.35,1.36 AbstractInvocationDispatcher.h,1.16,1.17 ChainableMockObject_macro.h,1.13,1.14 ChainingMockBuilder.h,1.25,1.26 ChainingMockObjectSupport.h,1.21,1.22 DynamicChainingMock.h,1.11,1.12 InvocationMocker.h,1.35,1.36
|
From: Ewald A. <ewa...@us...> - 2005-11-26 17:56:38
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20427/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h AbstractInvocationDispatcher.h ChainableMockObject_macro.h ChainingMockBuilder.h ChainingMockObjectSupport.h DynamicChainingMock.h InvocationMocker.h Log Message: prepare use of alternative stl Index: ChainingMockBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockBuilder.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ChainingMockBuilder.h 13 Nov 2005 11:53:18 -0000 1.25 +++ ChainingMockBuilder.h 26 Nov 2005 17:56:30 -0000 1.26 @@ -36,7 +36,7 @@ #include <mockpp/mockpp.h> // always first -#include <map> +#include MOCKPP_MAP_H #include <mockpp/chaining/DynamicChainingMock.h> #include <mockpp/chaining/InvocationMocker.h> Index: AbstractInvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractInvocationDispatcher.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- AbstractInvocationDispatcher.h 13 Nov 2005 11:53:18 -0000 1.16 +++ AbstractInvocationDispatcher.h 26 Nov 2005 17:56:30 -0000 1.17 @@ -36,7 +36,7 @@ #include <mockpp/mockpp.h> // always first -#include <vector> +#include MOCKPP_VECTOR_H #include <mockpp/chaining/InvocationDispatcher.h> #include <mockpp/chaining/Invokable.h> @@ -58,7 +58,7 @@ protected: typedef Invokable<R, I> Item; - typedef std::vector<Item*> List; + typedef MOCKPP_STL::vector<Item*> List; typedef typename List::iterator Iterator; typedef typename List::reverse_iterator ReverseIterator; Index: ChainableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject_macro.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChainableMockObject_macro.h 19 Sep 2005 18:33:40 -0000 1.13 +++ ChainableMockObject_macro.h 26 Nov 2005 17:56:30 -0000 1.14 @@ -100,7 +100,7 @@ #define MOCKPP_VOID_CHAINABLE0_IMPL(classname, m_name, \ a_name) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation0 inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name)); \ m_name ## CoreMock.invoke(inv); \ } \ @@ -120,7 +120,7 @@ #define MOCKPP_VOID_CHAINABLE1_IMPL(classname, m_name, m_type1, \ a_name, v_type1) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation1< v_type1 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ m_name ## CoreMock.invoke(inv); \ } \ @@ -140,7 +140,7 @@ #define MOCKPP_VOID_CHAINABLE2_IMPL(classname, m_name, m_type1, m_type2, \ a_name, v_type1, v_type2) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation2< v_type1, v_type2 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2); \ m_name ## CoreMock.invoke(inv); \ } \ @@ -164,7 +164,7 @@ #define MOCKPP_VOID_CHAINABLE3_IMPL(classname, m_name, m_type1, m_type2, m_type3, \ a_name, v_type1, v_type2, v_type3) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation3< v_type1, v_type2, v_type3 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3); \ m_name ## CoreMock.invoke(inv); \ } \ @@ -190,7 +190,7 @@ #define MOCKPP_VOID_CHAINABLE4_IMPL(classname, m_name, m_type1, m_type2, m_type3, m_type4, \ a_name, v_type1, v_type2, v_type3, v_type4) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation4< v_type1, v_type2, v_type3, v_type4 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4); \ m_name ## CoreMock.invoke(inv); \ } \ @@ -218,7 +218,7 @@ #define MOCKPP_VOID_CHAINABLE5_IMPL(classname, m_name, m_type1, m_type2, m_type3, m_type4, m_type5, \ a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation5< v_type1, v_type2, v_type3, v_type4, v_type5 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4, (v_type5&)param5); \ m_name ## CoreMock.invoke(inv); \ } \ @@ -239,7 +239,7 @@ #define MOCKPP_CHAINABLE0_IMPL(classname, m_ret_type, m_name, \ v_ret_type, a_name) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation0 inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name)); \ return m_name ## CoreMock.invoke(inv); \ } \ @@ -261,7 +261,7 @@ #define MOCKPP_CHAINABLE1_IMPL(classname, m_ret_type, m_name, m_type1, \ v_ret_type, a_name, v_type1) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation1< v_type1 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ return m_name ## CoreMock.invoke(inv); \ } \ @@ -283,7 +283,7 @@ #define MOCKPP_CHAINABLE2_IMPL(classname, m_ret_type, m_name, m_type1, m_type2, \ v_ret_type, a_name, v_type1, v_type2) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation2< v_type1, v_type2 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2); \ return m_name ## CoreMock.invoke(inv); \ } \ @@ -309,7 +309,7 @@ #define MOCKPP_CHAINABLE3_IMPL(classname, m_ret_type, m_name, m_type1, m_type2, m_type3, \ v_ret_type, a_name, v_type1, v_type2, v_type3) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation3< v_type1, v_type2, v_type3 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3); \ return m_name ## CoreMock.invoke(inv); \ } \ @@ -337,7 +337,7 @@ #define MOCKPP_CHAINABLE4_IMPL(classname, m_ret_type, m_name, m_type1, m_type2, m_type3, m_type4, \ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation4< v_type1, v_type2, v_type3, v_type4 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4); \ return m_name ## CoreMock.invoke(inv); \ } \ @@ -367,7 +367,7 @@ #define MOCKPP_CHAINABLE5_IMPL(classname, m_ret_type, m_name, m_type1, m_type2, m_type3, m_type4, m_type5, \ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ - std::string func_name (#m_name); \ + MOCKPP_STL::string func_name (#m_name); \ mockpp::Invocation5< v_type1, v_type2, v_type3, v_type4, v_type5 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4, (v_type5&)param5); \ return m_name ## CoreMock.invoke(inv); \ } \ Index: InvocationMocker.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationMocker.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- InvocationMocker.h 19 Oct 2005 20:14:27 -0000 1.35 +++ InvocationMocker.h 26 Nov 2005 17:56:30 -0000 1.36 @@ -38,7 +38,7 @@ #include <mockpp/mockpp.h> // always first -#include <vector> +#include MOCKPP_VECTOR_H #include <mockpp/chaining/StubMatchersCollection.h> #include <mockpp/chaining/Invokable.h> @@ -82,7 +82,7 @@ public: - typedef typename std::vector<InvocationMatcher<I>*> List; + typedef typename MOCKPP_STL::vector<InvocationMatcher<I>*> List; typedef typename List::iterator Iterator; typedef typename List::const_iterator ConstIterator; @@ -206,7 +206,7 @@ * @return The current content of the buffer data */ virtual String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, + const typename MOCKPP_STL::vector<InvocationMatcher<I>*> &matchers, Stub<R, I> *stub, const String &name ) const = 0; @@ -218,7 +218,7 @@ * @return The current content of the buffer data */ String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, + const typename MOCKPP_STL::vector<InvocationMatcher<I>*> &matchers, TypelessStub<R>* stub, const String &name ) const { @@ -254,7 +254,7 @@ * @return The current content of the buffer data */ virtual String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, + const typename MOCKPP_STL::vector<InvocationMatcher<I>*> &matchers, Stub<R, I> *stub, const String &name ) const { @@ -309,7 +309,7 @@ * @return The current content of the buffer data */ String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, + const typename MOCKPP_STL::vector<InvocationMatcher<I>*> &matchers, Stub<R, I> *stub, const String &name ) const { Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- AbstractDynamicChainingMock.h 13 Nov 2005 11:53:18 -0000 1.35 +++ AbstractDynamicChainingMock.h 26 Nov 2005 17:56:30 -0000 1.36 @@ -94,7 +94,7 @@ * @return The current content of the buffer data */ virtual String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, + const typename MOCKPP_STL::vector<InvocationMatcher<I>*> &matchers, Stub<R, I> *stub, const String &name ) const { @@ -113,7 +113,7 @@ * @return The current content of the buffer data */ String describeTo( String &result, - const typename std::vector<InvocationMatcher<I>*> &matchers, + const typename MOCKPP_STL::vector<InvocationMatcher<I>*> &matchers, TypelessStub<R>* stub, const String &name ) const { Index: ChainingMockObjectSupport.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockObjectSupport.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ChainingMockObjectSupport.h 23 Jul 2005 13:55:47 -0000 1.21 +++ ChainingMockObjectSupport.h 26 Nov 2005 17:56:30 -0000 1.22 @@ -259,7 +259,7 @@ * @param substring the substring * @return the new constraint */ -template <typename S> // std::basic_string<char_type> +template <typename S> // MOCKPP_STL::basic_string<char_type> typename Constraint<S>::AP stringContains( const S &substring ) { @@ -273,7 +273,7 @@ * @param substring the substring * @return the new constraint */ -template <typename S> // std::basic_string<char_type> +template <typename S> // MOCKPP_STL::basic_string<char_type> typename Constraint<S>::AP startsWith( const S &substring ) { @@ -287,7 +287,7 @@ * @param substring the substring * @return the new constraint */ -template <typename S> // std::basic_string<char_type> +template <typename S> // MOCKPP_STL::basic_string<char_type> typename Constraint<S>::AP endsWith( const S &substring ) { @@ -302,10 +302,10 @@ * @return the new constraint */ template <typename PCS> // pointer to const char_type -typename Constraint<std::basic_string<PCS> >::AP +typename Constraint<MOCKPP_STL::basic_string<PCS> >::AP stringContains( const PCS *substring ) { - return new StringContains<std::basic_string<PCS> >( substring ); + return new StringContains<MOCKPP_STL::basic_string<PCS> >( substring ); } @@ -401,7 +401,7 @@ typename TypelessStub<R>::AP onConsecutiveCalls( TypelessStub<R> *stub1, TypelessStub<R> *stub2 ) { - std::vector<TypelessStub<R>*> vec; + MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1); vec.push_back( stub2); return new TypelessStubSequence<R>( vec.begin(), vec.end() ); @@ -420,7 +420,7 @@ typename Stub<R, I>::AP onConsecutiveCalls( Stub<R, I> *stub1, Stub<R, I> *stub2 ) { - std::vector<Stub<R, I>*> vec; + MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1); vec.push_back( stub2); return new StubSequence<R, I>( vec.begin(), vec.end() ); @@ -440,7 +440,7 @@ TypelessStub<R> *stub2, TypelessStub<R> *stub3 ) { - std::vector<TypelessStub<R>*> vec; + MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1 ); vec.push_back( stub2 ); vec.push_back( stub3 ); @@ -462,7 +462,7 @@ Stub<R, I> *stub2, Stub<R, I> *stub3 ) { - std::vector<Stub<R, I>*> vec; + MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1 ); vec.push_back( stub2 ); vec.push_back( stub3 ); @@ -485,7 +485,7 @@ TypelessStub<R> *stub3, TypelessStub<R> *stub4 ) { - std::vector<TypelessStub<R>*> vec; + MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1 ); vec.push_back( stub2 ); vec.push_back( stub3 ); @@ -510,7 +510,7 @@ Stub<R, I> *stub3, Stub<R, I> *stub4 ) { - std::vector<Stub<R, I>*> vec; + MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1 ); vec.push_back( stub2 ); vec.push_back( stub3 ); @@ -536,7 +536,7 @@ TypelessStub<R> *stub4, TypelessStub<R> *stub5 ) { - std::vector<TypelessStub<R>*> vec; + MOCKPP_STL::vector<TypelessStub<R>*> vec; vec.push_back( stub1 ); vec.push_back( stub2 ); vec.push_back( stub3 ); @@ -564,7 +564,7 @@ Stub<R, I> *stub4, Stub<R, I> *stub5 ) { - std::vector<Stub<R, I>*> vec; + MOCKPP_STL::vector<Stub<R, I>*> vec; vec.push_back( stub1 ); vec.push_back( stub2 ); vec.push_back( stub3 ); Index: DynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/DynamicChainingMock.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- DynamicChainingMock.h 30 Dec 2004 20:54:04 -0000 1.11 +++ DynamicChainingMock.h 26 Nov 2005 17:56:30 -0000 1.12 @@ -38,7 +38,7 @@ #include <mockpp/mockpp.h> // always first -#include <vector> +#include MOCKPP_VECTOR_H #include <mockpp/Verifiable.h> |
