[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.40,1.41 AbstractInvocationDi
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/chaining AbstractDynamicChainingMock.h,1.40,1.41 AbstractInvocationDispatcher.h,1.18,1.19 ChainableMockMethod.h,1.14,1.15 ChainableMockMethod0.h,1.14,1.15 ChainableMockMethod1.h,1.14,1.15 ChainableMockMethod2.h,1.14,1.15 ChainableMockMethod3.h,1.14,1.15 ChainableMockMethod4.h,1.14,1.15 ChainableMockMethod5.h,1.14,1.15 ChainableMockMethod6.h,1.12,1.13 ChainableMockObject.cpp,1.4,1.5 ChainableMockObject.h,1.2,1.3 ChainableMockObject_macro.h,1.16,1.17 ChainingMockBuilder.h,1.28,1.29 ChainingMockObjectSupport.cpp,1.6,1.7 ChainingMockObjectSupport.h,1.24,1.25 CoreMock.h,1.17,1.18 CountedChainableMethod.h,1.8,1.9 DynamicChainingMock.h,1.13,1.14 DynamicChainingMockError.h,1.7,1.8 FIFOInvocationDispatcher.h,1.15,1.16 Invocation.cpp,1.6,1.7 Invocation.h,1.19,1.20 InvocationDispatcher.h,1.11,1.12 InvocationMocker.h,1.39,1.40 InvocationN.h,1.8,1.9 Invokable.h,1.8,1.9 LIFOInvocationDispatcher.h,1.15,1.16 StubMatchersCollection.h,1.14,1.15 gen_chainablemethod_N.pl,1.10,1.11 gen_countchainable_N.pl,1.7,1.8 gen_invocation_N.pl,1.2,1.3
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h AbstractInvocationDispatcher.h ChainableMockMethod.h ChainableMockMethod0.h ChainableMockMethod1.h ChainableMockMethod2.h ChainableMockMethod3.h ChainableMockMethod4.h ChainableMockMethod5.h ChainableMockMethod6.h ChainableMockObject.cpp ChainableMockObject.h ChainableMockObject_macro.h ChainingMockBuilder.h ChainingMockObjectSupport.cpp ChainingMockObjectSupport.h CoreMock.h CountedChainableMethod.h DynamicChainingMock.h DynamicChainingMockError.h FIFOInvocationDispatcher.h Invocation.cpp Invocation.h InvocationDispatcher.h InvocationMocker.h InvocationN.h Invokable.h LIFOInvocationDispatcher.h StubMatchersCollection.h gen_chainablemethod_N.pl gen_countchainable_N.pl gen_invocation_N.pl Log Message: optionally disable mockpp namespace Index: ChainableMockMethod6.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod6.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChainableMockMethod6.h 6 Jan 2006 20:53:51 -0000 1.12 +++ ChainableMockMethod6.h 15 Mar 2006 21:34:01 -0000 1.13 @@ -37,7 +37,7 @@ #include <mockpp/chaining/ChainableMockMethod.h> -namespace mockpp { +MOCKPP_NS_END /** Common stuff to set up chainable mock method expectations with 6 parameters. @@ -161,7 +161,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ChainableMockMethod6_H Index: FIFOInvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/FIFOInvocationDispatcher.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- FIFOInvocationDispatcher.h 29 Dec 2005 19:29:50 -0000 1.15 +++ FIFOInvocationDispatcher.h 15 Mar 2006 21:34:02 -0000 1.16 @@ -41,7 +41,7 @@ #include <mockpp/chaining/AbstractInvocationDispatcher.h> -namespace mockpp { +MOCKPP_NS_START /** Dispatch invokables First-In-First-Out @@ -114,19 +114,19 @@ #else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness -/** Declare a specialized class for mockpp::FIFOInvocationDispatcher. +/** Declare a specialized class for MOCKPP_NS::FIFOInvocationDispatcher. * Neccessary for compilers with weak template capabilities. */ #define MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_DECL(I) \ template<> \ -void mockpp::FIFOInvocationDispatcher<void, I >::dispatch( const I &invocation ); +void MOCKPP_NS::FIFOInvocationDispatcher<void, I >::dispatch( const I &invocation ); -/** Implement a specialized class for mockpp::FIFOInvocationDispatcher. +/** Implement a specialized class for MOCKPP_NS::FIFOInvocationDispatcher. * Neccessary for compilers with weak template capabilities. */ #define MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_IMPL(I) \ -namespace mockpp { \ +MOCKPP_NS_START \ template<> \ class FIFOInvocationDispatcher<void, I> : public AbstractInvocationDispatcher<void, I> \ { \ @@ -149,12 +149,12 @@ this->defaultStub->invoke( invocation ); \ } \ }; \ -} +MOCKPP_NS_END #endif -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_FIFOINVOCATIONDISPATCHER_H Index: ChainableMockMethod3.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod3.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockMethod3.h 6 Jan 2006 20:53:51 -0000 1.14 +++ ChainableMockMethod3.h 15 Mar 2006 21:34:01 -0000 1.15 @@ -37,7 +37,7 @@ #include <mockpp/chaining/ChainableMockMethod.h> -namespace mockpp { +MOCKPP_NS_END /** Common stuff to set up chainable mock method expectations with 3 parameters. @@ -155,7 +155,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ChainableMockMethod3_H Index: CountedChainableMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/CountedChainableMethod.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- CountedChainableMethod.h 18 Jan 2006 19:56:50 -0000 1.8 +++ CountedChainableMethod.h 15 Mar 2006 21:34:02 -0000 1.9 @@ -42,7 +42,7 @@ #include <mockpp/chaining/ChainableMockMethod6.h> -namespace mockpp { +MOCKPP_NS_END #ifndef MOCKPP_COUNTED_WEAKNESS @@ -455,7 +455,7 @@ #endif // MOCKPP_COUNTED_WEAKNESS -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_COUNTEDCHAINABLEMETHOD_H Index: ChainableMockMethod4.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod4.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockMethod4.h 6 Jan 2006 20:53:51 -0000 1.14 +++ ChainableMockMethod4.h 15 Mar 2006 21:34:01 -0000 1.15 @@ -37,7 +37,7 @@ #include <mockpp/chaining/ChainableMockMethod.h> -namespace mockpp { +MOCKPP_NS_END /** Common stuff to set up chainable mock method expectations with 4 parameters. @@ -157,7 +157,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ChainableMockMethod4_H Index: CoreMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/CoreMock.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- CoreMock.h 29 Dec 2005 19:29:50 -0000 1.17 +++ CoreMock.h 15 Mar 2006 21:34:02 -0000 1.18 @@ -40,7 +40,7 @@ #include <mockpp/chaining/AbstractDynamicChainingMock.h> -namespace mockpp { +MOCKPP_NS_START /** Helper class for chaining mocks. @@ -133,19 +133,19 @@ #else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness -/** Declare a specialized class for mockpp::CoreMock. +/** Declare a specialized class for MOCKPP_NS::CoreMock. * Neccessary for compilers with weak template capabilities. */ #define MOCKPP_COREMOCK_PTI_DECL(I) \ template<> \ -void mockpp::CoreMock<void, I >; +void MOCKPP_NS::CoreMock<void, I >; -/** Implement a specialized class for mockpp::CoreMock. +/** Implement a specialized class for MOCKPP_NS::CoreMock. * Neccessary for compilers with weak template capabilities. */ #define MOCKPP_COREMOCK_PTI_IMPL(I) \ -namespace mockpp { \ +MOCKPP_NS_START \ template<> \ class CoreMock<void, I> : public AbstractDynamicChainingMock<void, I> \ { \ @@ -165,12 +165,12 @@ mockInvocation( invocation ); \ } \ }; \ -} +MOCKPP_NS_END #endif -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_COREMOCK_H Index: ChainableMockObject.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ChainableMockObject.cpp 16 Jan 2006 16:52:53 -0000 1.4 +++ ChainableMockObject.cpp 15 Mar 2006 21:34:01 -0000 1.5 @@ -35,7 +35,7 @@ #include <mockpp/chaining/ChainableMockObject.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT ChainableMockObjectBase::ChainableMockObjectBase(const String &name) @@ -174,4 +174,4 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: ChainableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ChainableMockObject.h 29 Dec 2005 19:29:50 -0000 1.2 +++ ChainableMockObject.h 15 Mar 2006 21:34:01 -0000 1.3 @@ -46,7 +46,7 @@ #include <mockpp/matcher/TypelessMatcher.h> -namespace mockpp { +MOCKPP_NS_START /** Base for a generic object that can be used to replace a real world object @@ -171,7 +171,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END ////////////////////////////////////////////////////////////// Index: ChainableMockMethod0.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod0.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockMethod0.h 6 Jan 2006 20:53:51 -0000 1.14 +++ ChainableMockMethod0.h 15 Mar 2006 21:34:01 -0000 1.15 @@ -37,7 +37,7 @@ #include <mockpp/chaining/ChainableMockMethod.h> -namespace mockpp { +MOCKPP_NS_END /** Common stuff to set up chainable mock method expectations with 0 parameters. @@ -149,7 +149,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ChainableMockMethod0_H Index: ChainableMockMethod1.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod1.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockMethod1.h 6 Jan 2006 20:53:51 -0000 1.14 +++ ChainableMockMethod1.h 15 Mar 2006 21:34:01 -0000 1.15 @@ -37,7 +37,7 @@ #include <mockpp/chaining/ChainableMockMethod.h> -namespace mockpp { +MOCKPP_NS_END /** Common stuff to set up chainable mock method expectations with 1 parameters. @@ -151,7 +151,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ChainableMockMethod1_H Index: ChainableMockMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockMethod.h 29 Dec 2005 19:29:50 -0000 1.14 +++ ChainableMockMethod.h 15 Mar 2006 21:34:01 -0000 1.15 @@ -38,7 +38,7 @@ //#include <mockpp/CountedChainableMethod.h> -namespace mockpp { +MOCKPP_NS_START /** Common stuff to set up chainable mock method expectations @@ -78,7 +78,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_CHAINABLEMOCKMETHOD_H Index: ChainableMockMethod5.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod5.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockMethod5.h 6 Jan 2006 20:53:51 -0000 1.14 +++ ChainableMockMethod5.h 15 Mar 2006 21:34:01 -0000 1.15 @@ -37,7 +37,7 @@ #include <mockpp/chaining/ChainableMockMethod.h> -namespace mockpp { +MOCKPP_NS_END /** Common stuff to set up chainable mock method expectations with 5 parameters. @@ -159,7 +159,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ChainableMockMethod5_H Index: ChainableMockMethod2.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockMethod2.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChainableMockMethod2.h 6 Jan 2006 20:53:51 -0000 1.14 +++ ChainableMockMethod2.h 15 Mar 2006 21:34:01 -0000 1.15 @@ -37,7 +37,7 @@ #include <mockpp/chaining/ChainableMockMethod.h> -namespace mockpp { +MOCKPP_NS_END /** Common stuff to set up chainable mock method expectations with 2 parameters. @@ -153,7 +153,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ChainableMockMethod2_H Index: Invocation.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Invocation.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Invocation.h 29 Dec 2005 19:29:50 -0000 1.19 +++ Invocation.h 15 Mar 2006 21:34:02 -0000 1.20 @@ -44,7 +44,7 @@ #include <mockpp/compat/Formatter.h> -namespace mockpp { +MOCKPP_NS_START #ifdef MOCKPP_USE_INVOCATION_EQUALS @@ -52,7 +52,7 @@ /** Default comparison function for the various \c Invocation classes. * The default implementation compares the values of the two * objects. - * @see mockpp::Invocation + * @see MOCKPP_NS::Invocation * @param left left operand * @param right right operand * @return true if both values are equal @@ -156,7 +156,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOKATION_H Index: Invocation.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Invocation.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Invocation.cpp 29 Dec 2005 19:29:50 -0000 1.6 +++ Invocation.cpp 15 Mar 2006 21:34:02 -0000 1.7 @@ -34,7 +34,7 @@ #include <mockpp/chaining/Invocation.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT InvocationBase::~InvocationBase() @@ -95,5 +95,5 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: InvocationN.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationN.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- InvocationN.h 29 Dec 2005 19:29:50 -0000 1.8 +++ InvocationN.h 15 Mar 2006 21:34:02 -0000 1.9 @@ -1,7 +1,7 @@ /** @file @internal NOT INTENDED FOR PUBLIC INCLUSION @brief Generated with gen_invocation_N.pl. - + $Id$ ***************************************************************************/ @@ -34,7 +34,7 @@ //#include <mockpp/chaining/Invocation.h> -namespace mockpp { +MOCKPP_NS_END @@ -695,7 +695,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOCATION_N_H Index: ChainingMockObjectSupport.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockObjectSupport.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ChainingMockObjectSupport.h 29 Dec 2005 19:29:50 -0000 1.24 +++ ChainingMockObjectSupport.h 15 Mar 2006 21:34:02 -0000 1.25 @@ -68,11 +68,11 @@ #include <mockpp/matcher/TypelessMatcher.h> -namespace mockpp { +MOCKPP_NS_START /** * @defgroup grp_constraint_abbrev Abbreviated Parameter Constraints - * @see mockpp::Constraint + * @see MOCKPP_NS::Constraint * Provides convenience functions that create contraint objects. * Use of these functions should also help to increase readability * if you import them via some appriopriate \c using directive. @@ -80,7 +80,7 @@ /** * @defgroup grp_stub_abbrev Abbreviated Stubs - * @see mockpp::Stub + * @see MOCKPP_NS::Stub * Provides convenience functions that create stub objects. * Use of these functions should also help to increase readability * if you import them via some appriopriate \c using directive. @@ -88,7 +88,7 @@ /** * @defgroup grp_matcher_abbrev Abbreviated Matchers - * @see mockpp::InvocationMatcher + * @see MOCKPP_NS::InvocationMatcher * Provides convenience functions that create matcher objects. * Use of these functions should also help to increase readability * if you import them via some appriopriate \c using directive. @@ -96,7 +96,7 @@ /** Creates a constraint that matches any invocation * @ingroup grp_constraint_abbrev - * @see mockpp::IsAnything + * @see MOCKPP_NS::IsAnything * @return the new constraint */ TypelessConstraint::AP any(); @@ -104,7 +104,7 @@ /** Creates a constraint that never matches an invocation * @ingroup grp_constraint_abbrev - * @see mockpp::IsNothing + * @see MOCKPP_NS::IsNothing * @return the new constraint */ TypelessConstraint::AP nothing(); @@ -112,7 +112,7 @@ /** Passes a value back via a reference (outbound value). * @ingroup grp_constraint_abbrev - * @see mockpp::OutBound + * @see MOCKPP_NS::OutBound * @param op object to return at invoationwith * @return the new constraint */ @@ -126,7 +126,7 @@ /** Creates a constraint that tests for equality * @ingroup grp_constraint_abbrev - * @see mockpp::IsEqual + * @see MOCKPP_NS::IsEqual * @param op object to compare with * @return the new constraint */ @@ -140,7 +140,7 @@ /** Creates a constraint that tests for non-equality * @ingroup grp_constraint_abbrev - * @see mockpp::IsNot + * @see MOCKPP_NS::IsNot * @param op object to compare with * @return the new constraint */ @@ -154,7 +154,7 @@ /** Creates a constraint that tests for near-equality * @ingroup grp_constraint_abbrev - * @see mockpp::IsCloseTo + * @see MOCKPP_NS::IsCloseTo * @param operand object to compare with * @param deviation amount of allowed deviation * @return the new constraint @@ -169,7 +169,7 @@ /** Creates a less-or-equal constraint * @ingroup grp_constraint_abbrev - * @see mockpp::IsLessOrEqual + * @see MOCKPP_NS::IsLessOrEqual * @param value object to compare with * @return the new constraint */ @@ -183,7 +183,7 @@ /** Creates a less-than constraint * @ingroup grp_constraint_abbrev - * @see mockpp::IsLessThan + * @see MOCKPP_NS::IsLessThan * @param value object to compare with * @return the new constraint */ @@ -197,7 +197,7 @@ /** Creates a greater-than constraint * @ingroup grp_constraint_abbrev - * @see mockpp::IsGreaterThan + * @see MOCKPP_NS::IsGreaterThan * @param value object to compare with * @return the new constraint */ @@ -211,7 +211,7 @@ /** Creates a greater-or-equal constraint * @ingroup grp_constraint_abbrev - * @see mockpp::IsGreaterOrEqual + * @see MOCKPP_NS::IsGreaterOrEqual * @param value object to compare with * @return the new constraint */ @@ -225,7 +225,7 @@ /** Creates a constraint that checks if an object is the same * @ingroup grp_constraint_abbrev - * @see mockpp::IsSame + * @see MOCKPP_NS::IsSame * @param operand object to compare with * @return the new constraint */ @@ -243,7 +243,7 @@ * The base class is needed since dynamic_cast checks for an existing traversal * from \c derived to \c base. * @ingroup grp_constraint_abbrev - * @see mockpp::IsInstanceOf + * @see MOCKPP_NS::IsInstanceOf * @return the new constraint */ template <typename ROOT, @@ -259,7 +259,7 @@ /** Creates a constraint that checks for the occurence of a substring * @ingroup grp_constraint_abbrev - * @see mockpp::StringContains + * @see MOCKPP_NS::StringContains * @param substring the substring * @return the new constraint */ @@ -273,7 +273,7 @@ /** Creates a constraint that checks for the occurence of a starting substring * @ingroup grp_constraint_abbrev - * @see mockpp::StringStartsWith + * @see MOCKPP_NS::StringStartsWith * @param substring the substring * @return the new constraint */ @@ -287,7 +287,7 @@ /** Creates a constraint that checks for the occurence of a trailing substring * @ingroup grp_constraint_abbrev - * @see mockpp::StringEndsWith + * @see MOCKPP_NS::StringEndsWith * @param substring the substring * @return the new constraint */ @@ -301,7 +301,7 @@ /** Creates a constraint that checks for the occurence of a substring * @ingroup grp_constraint_abbrev - * @see mockpp::StringContains + * @see MOCKPP_NS::StringContains * @param substring the substring * @return the new constraint */ @@ -315,7 +315,7 @@ /** Creates a constraint that negates another * @ingroup grp_constraint_abbrev - * @see mockpp::IsNot + * @see MOCKPP_NS::IsNot * @param c the other constraint * @return the new constraint */ @@ -329,7 +329,7 @@ /** Creates a constraint to logically-and two other constraints * @ingroup grp_constraint_abbrev - * @see mockpp::And + * @see MOCKPP_NS::And * @param left the first constraint * @param right the second constraint * @return the new constraint @@ -345,7 +345,7 @@ /** Creates a constraint to logically-or two other constraints * @ingroup grp_constraint_abbrev - * @see mockpp::Or + * @see MOCKPP_NS::Or * @param left the first constraint * @param right the second constraint * @return the new constraint @@ -361,7 +361,7 @@ /** Creates a stub returning a value * @ingroup grp_stub_abbrev - * @see mockpp::ReturnStub + * @see MOCKPP_NS::ReturnStub * @param o the value to return * @return the new stub */ @@ -374,7 +374,7 @@ /** Creates a stub returning a void stub * @ingroup grp_stub_abbrev - * @see mockpp::VoidStub + * @see MOCKPP_NS::VoidStub * @return the new stub */ TypelessStub<void>::AP isVoid( ); @@ -382,7 +382,7 @@ /** Creates a stub throwing a value * @ingroup grp_stub_abbrev - * @see mockpp::ThrowStub + * @see MOCKPP_NS::ThrowStub * @param val the value to throw * @return the new stub */ @@ -396,7 +396,7 @@ /** Creates a sequence of typeless stubs. * @ingroup grp_stub_abbrev - * @see mockpp::TypelessStubSequence + * @see MOCKPP_NS::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @return the new stub @@ -414,7 +414,7 @@ /** Creates a sequence of stubs. * @ingroup grp_stub_abbrev - * @see mockpp::StubSequence + * @see MOCKPP_NS::StubSequence * @param stub1 first stub * @param stub2 the next stub * @return the new stub @@ -433,7 +433,7 @@ /** Creates a sequence of typeless stubs. * @ingroup grp_stub_abbrev - * @see mockpp::TypelessStubSequence + * @see MOCKPP_NS::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub @@ -454,7 +454,7 @@ /** Creates a sequence of stubs. * @ingroup grp_stub_abbrev - * @see mockpp::StubSequence + * @see MOCKPP_NS::StubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub @@ -476,7 +476,7 @@ /** Creates a sequence of typeless stubs. * @ingroup grp_stub_abbrev - * @see mockpp::TypelessStubSequence + * @see MOCKPP_NS::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub @@ -500,7 +500,7 @@ /** Creates a sequence of stubs. * @ingroup grp_stub_abbrev - * @see mockpp::StubSequence + * @see MOCKPP_NS::StubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub @@ -525,7 +525,7 @@ /** Creates a sequence of typeless stubs. * @ingroup grp_stub_abbrev - * @see mockpp::TypelessStubSequence + * @see MOCKPP_NS::TypelessStubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub @@ -552,7 +552,7 @@ /** Creates a sequence of stubs. * @ingroup grp_stub_abbrev - * @see mockpp::StubSequence + * @see MOCKPP_NS::StubSequence * @param stub1 first stub * @param stub2 the next stub * @param stub3 the next stub @@ -580,7 +580,7 @@ /** Creates a matcher to verify a single invocation * @ingroup grp_matcher_abbrev - * @see mockpp::InvokeOnceMatcher + * @see MOCKPP_NS::InvokeOnceMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> once(); @@ -588,7 +588,7 @@ /** Creates a matcher to verify a minimum invocation count of one. * @ingroup grp_matcher_abbrev - * @see mockpp::InvokeAtLeastOnceMatcher + * @see MOCKPP_NS::InvokeAtLeastOnceMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> atLeastOnce(); @@ -596,7 +596,7 @@ /** Creates a matcher to verify an arbitrary invocation count. * @ingroup grp_matcher_abbrev - * @see mockpp::UnlimitedMatcher + * @see MOCKPP_NS::UnlimitedMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> unlimited(); @@ -604,7 +604,7 @@ /** Creates a matcher to verify a maximal invocation count. * @ingroup grp_matcher_abbrev - * @see mockpp::InvokeAtMostMatcher + * @see MOCKPP_NS::InvokeAtMostMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> atMost( int expectedCount ); @@ -612,7 +612,7 @@ /** Creates a matcher to verify a minimal invocation count. * @ingroup grp_matcher_abbrev - * @see mockpp::InvokeAtLeastMatcher + * @see MOCKPP_NS::InvokeAtLeastMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> atLeast(int expectedCount); @@ -620,7 +620,7 @@ /** Creates a matcher to verify an exact invocation count. * @ingroup grp_matcher_abbrev - * @see mockpp::InvokeCountMatcher + * @see MOCKPP_NS::InvokeCountMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> exactly( int expectedCount ); @@ -628,7 +628,7 @@ /** Creates a matcher to verify that the invactation never occured. * @ingroup grp_matcher_abbrev - * @see mockpp::TestFailureMatcher + * @see MOCKPP_NS::TestFailureMatcher * @return the new matcher */ AutoPointer<TypelessMatcher> never(); @@ -636,50 +636,50 @@ /** Creates a matcher to verify that the invactation never occured. * @ingroup grp_matcher_abbrev - * @see mockpp::TestFailureMatcher + * @see MOCKPP_NS::TestFailureMatcher * @param errorMessage additional info for error message * @return the new matcher */ AutoPointer<TypelessMatcher> never( const String &errorMessage ); -} //namespace mockpp +MOCKPP_NS_END /** Imports the abbreviations into the global namespace to enhance redability * by omitting namespace prefix. */ #ifdef MOCKPP_IMPORT_ABBREVIATED -using mockpp::any; -using mockpp::nothing; -using mockpp::eq; -using mockpp::ne; -using mockpp::le; -using mockpp::ge; -using mockpp::gt; -using mockpp::lt; -using mockpp::same; +using MOCKPP_NS::any; +using MOCKPP_NS::nothing; +using MOCKPP_NS::eq; +using MOCKPP_NS::ne; +using MOCKPP_NS::le; +using MOCKPP_NS::ge; +using MOCKPP_NS::gt; +using MOCKPP_NS::lt; +using MOCKPP_NS::same; #ifndef MOCKPP_NO_RTTI -using mockpp::isA; +using MOCKPP_NS::isA; #endif -using mockpp::stringContains; -using mockpp::startsWith; -using mockpp::endsWith; -using mockpp::logic_not; -using mockpp::logic_and; -using mockpp::logic_or; -using mockpp::returnValue; -using mockpp::onConsecutiveCalls; -using mockpp::throwException; -using mockpp::once; -using mockpp::atLeastOnce; -using mockpp::atMost; -using mockpp::atLeast; -using mockpp::exactly; -using mockpp::never; -using mockpp::isVoid; -using mockpp::unlimited; -using mockpp::outBound; +using MOCKPP_NS::stringContains; +using MOCKPP_NS::startsWith; +using MOCKPP_NS::endsWith; +using MOCKPP_NS::logic_not; +using MOCKPP_NS::logic_and; +using MOCKPP_NS::logic_or; +using MOCKPP_NS::returnValue; +using MOCKPP_NS::onConsecutiveCalls; +using MOCKPP_NS::throwException; +using MOCKPP_NS::once; +using MOCKPP_NS::atLeastOnce; +using MOCKPP_NS::atMost; +using MOCKPP_NS::atLeast; +using MOCKPP_NS::exactly; +using MOCKPP_NS::never; +using MOCKPP_NS::isVoid; +using MOCKPP_NS::unlimited; +using MOCKPP_NS::outBound; #endif Index: Invokable.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Invokable.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Invokable.h 29 Dec 2005 19:29:50 -0000 1.8 +++ Invokable.h 15 Mar 2006 21:34:02 -0000 1.9 @@ -45,7 +45,7 @@ #include <mockpp/chaining/Invocation.h> -namespace mockpp { +MOCKPP_NS_START /** Helper class to handle invocations @@ -87,7 +87,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOKABLE_H Index: ChainingMockBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockBuilder.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- ChainingMockBuilder.h 6 Jan 2006 20:53:51 -0000 1.28 +++ ChainingMockBuilder.h 15 Mar 2006 21:34:01 -0000 1.29 @@ -48,7 +48,7 @@ #include <mockpp/matcher/MatcherHolder.h> -namespace mockpp { +MOCKPP_NS_START /** Build chaining mocks @@ -130,7 +130,7 @@ * @ingroup grp_chainer * @param newDefaultStub pointer to the default stub */ - virtual void setDefaultStub( const mockpp::StubHolder<R, I> &newDefaultStub ) + virtual void setDefaultStub( const MOCKPP_NS::StubHolder<R, I> &newDefaultStub ) { coreMock->setDefaultStub( newDefaultStub ); } @@ -188,7 +188,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_CHAININGMOCKBUILDER_H Index: InvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationDispatcher.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- InvocationDispatcher.h 29 Dec 2005 19:29:50 -0000 1.11 +++ InvocationDispatcher.h 15 Mar 2006 21:34:02 -0000 1.12 @@ -46,7 +46,7 @@ #include <mockpp/chaining/Invokable.h> -namespace mockpp { +MOCKPP_NS_START /** Dispatch invokables @@ -76,7 +76,7 @@ /** Sets the default stub for the object * @param newDefaultStub pointer to the default stub */ - virtual void setDefaultStub( const mockpp::StubHolder<R, I> &newDefaultStub ) = 0; + virtual void setDefaultStub( const MOCKPP_NS::StubHolder<R, I> &newDefaultStub ) = 0; /** Adds an invokable * @param invokable pointer to the invocable @@ -90,7 +90,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOCATIONDISPATCHER_H Index: ChainingMockObjectSupport.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockObjectSupport.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainingMockObjectSupport.cpp 29 Dec 2005 19:29:50 -0000 1.6 +++ ChainingMockObjectSupport.cpp 15 Mar 2006 21:34:02 -0000 1.7 @@ -44,7 +44,7 @@ #include <mockpp/matcher/TestFailureMatcher.h> -namespace mockpp { +MOCKPP_NS_START AutoPointer<TypelessMatcher> MOCKPP_EXPORT once() @@ -114,4 +114,4 @@ return new VoidStub; } -} //namespace mockpp +MOCKPP_NS_END Index: AbstractInvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractInvocationDispatcher.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- AbstractInvocationDispatcher.h 29 Dec 2005 19:29:50 -0000 1.18 +++ AbstractInvocationDispatcher.h 15 Mar 2006 21:34:01 -0000 1.19 @@ -46,7 +46,7 @@ #include <mockpp/stub/TestFailureStub.h> -namespace mockpp { +MOCKPP_NS_START /** Base class for invocation dispatchers. @@ -84,7 +84,7 @@ /** Sets the default stub for the object * @param in_defaultStub pointer to the default stub */ - virtual void setDefaultStub( const mockpp::StubHolder<R, I> &in_defaultStub ) + virtual void setDefaultStub( const MOCKPP_NS::StubHolder<R, I> &in_defaultStub ) { defaultStub = in_defaultStub; } @@ -175,7 +175,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ABSTRACTINVOCATIONDISPATCHER_H Index: InvocationMocker.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationMocker.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- InvocationMocker.h 16 Jan 2006 16:52:53 -0000 1.39 +++ InvocationMocker.h 15 Mar 2006 21:34:02 -0000 1.40 @@ -53,7 +53,7 @@ #include <mockpp/stub/StubHolder.h> -namespace mockpp { +MOCKPP_NS_START /** Base class for helper objects to mock invocations. * @internal @@ -448,21 +448,21 @@ #else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness -/** Declare a specialized class for mockpp::InvocationMocker. +/** Declare a specialized class for MOCKPP_NS::InvocationMocker. * Neccessary for compilers with weak template capabilities. */ #define MOCKPP_INVOCATIONMOCKER_PTI_DECL(I) \ -namespace mockpp { \ +MOCKPP_NS_START \ template<> \ class InvocationMocker<void, I>; \ } -/** Implement a specialized class for mockpp::InvocationMocker. +/** Implement a specialized class for MOCKPP_NS::InvocationMocker. * Neccessary for compilers with weak template capabilities. */ #define MOCKPP_INVOCATIONMOCKER_PTI_IMPL(I) \ -namespace mockpp { \ +MOCKPP_NS_START \ template<> \ class InvocationMocker<void, I> : public InvocationMockerBase<void, I> \ { \ @@ -473,7 +473,7 @@ {} \ \ InvocationMocker<void, I >(\ - AutoPointer<mockpp::InvocationMockerBase<void, I >::DescriberBase> in_describer ) \ + AutoPointer<MOCKPP_NS::InvocationMockerBase<void, I >::DescriberBase> in_describer ) \ : InvocationMockerBase<void, I >( in_describer, \ new TypelessStubAdapter<void, I >(new VoidStub)) \ {} \ @@ -485,13 +485,13 @@ this->stub->invoke( invocation ); \ } \ }; \ -} +MOCKPP_NS_END #endif // MOCKPP_PTI_WEAKNESS -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOCATIONMOCKER_H Index: gen_invocation_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_invocation_N.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gen_invocation_N.pl 29 Dec 2005 19:29:50 -0000 1.2 +++ gen_invocation_N.pl 15 Mar 2006 21:34:02 -0000 1.3 @@ -13,14 +13,14 @@ $totalNumArgs = $ARGV[0]; if ($totalNumArgs < 5) { $totalNumArgs = 5; } - + open OUT, ">InvocationN.h"; -print OUT +print OUT "/** \@file \@internal NOT INTENDED FOR PUBLIC INCLUSION \@brief Generated with gen_invocation_N.pl. - + \$I" . "d: InvocationN.h,v 1.7 2005/10/19 20:53:09 ewald-arnold Exp \$ ***************************************************************************/ @@ -53,7 +53,7 @@ //#include <mockpp/chaining/Invocation.h> -namespace mockpp { +MOCKPP_NS_END "; @@ -67,18 +67,18 @@ } $templateParms .= "typename P$i"; } - if ($numArgs > 0) { + if ($numArgs > 0) { $templateParms_colon = ", " . $templateParms; } - + $templateArgs_colon = ""; $_ = $templateParms; s/typename //g; $templateArgs = $_; - if ($numArgs > 0) { + if ($numArgs > 0) { $templateArgs_colon = ", ". $templateArgs; } - + $parms = ""; for ($i = 1; $i <= $numArgs; ++$i) { if ($i > 1) { @@ -113,7 +113,7 @@ $args .= "p$i"; } - + $boundArgs = ""; for ($i = 1; $i <= $numArgs; ++$i) { if ($i > 1) { @@ -128,7 +128,7 @@ $argsAsMembers .= "P$i p$i;"; } - + $copyParms = ""; for ($i = 1; $i <= $numArgs; ++$i) { if ($i > 1) { @@ -146,7 +146,7 @@ $hArgs .= "h$i"; } - + $initArgs = ""; if ($numArgs > 0) { $initArgs = ":"; @@ -158,14 +158,14 @@ $initArgs .= "p$i(ip$i)"; } - + $argTypes = ""; for ($i = 1; $i <= $numArgs; ++$i) { $argTypes .= "typedef P$i p". ($i+1) . "_type; "; } print "Creating Invocation" . $numArgs ."\n"; - + print OUT " /** Hold invocations with " . $numArgs . " parameters @@ -180,7 +180,7 @@ typedef ConstraintSet" . $numArgs . "<" . $templateArgs . "> ConstraintSetType; "; - + for($p = 1; $p <= $numArgs; ++$p) { print OUT " typedef P" . $p . " T" . $p . "Type;"; } @@ -188,14 +188,14 @@ /** Constructs the object * \@param name name of he object"; - + for($p = 1; $p <= $numArgs; ++$p) { print OUT " * \@param in_param" . $p . " parameter " . $p ; } print OUT " */ Invocation" . $numArgs . "( const String &name"; - + for($p = 1; $p <= $numArgs; ++$p) { print OUT " , const P" . $p . " &in_param" . $p; } @@ -218,9 +218,9 @@ virtual bool equals( const Invocation" . $numArgs . "<" . $templateArgs . "> &other ) const { return invocationComparison(param1, other.param1)"; - + for($p = 2; $p <= $numArgs; ++$p) { print OUT " - && invocationComparison(param" . $p . ", other.param" . $p . ")";} + && invocationComparison(param" . $p . ", other.param" . $p . ")";} print OUT "; } @@ -247,7 +247,7 @@ return param" . $p . "; } "; } - + print OUT " /** Returns a description of the parameters * \@return the description @@ -256,10 +256,10 @@ { String fmt = MOCKPP_PCHAR(\"" . $percentParms . "\"); fmt << param1"; - + for($p = 2; $p <= $numArgs; ++$p) { print OUT " - << param" .$p; } - + << param" .$p; } + print OUT "; return fmt; } @@ -278,7 +278,7 @@ print OUT " -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_INVOCATION_N_H Index: LIFOInvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/LIFOInvocationDispatcher.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- LIFOInvocationDispatcher.h 29 Dec 2005 19:29:50 -0000 1.15 +++ LIFOInvocationDispatcher.h 15 Mar 2006 21:34:02 -0000 1.16 @@ -40,7 +40,7 @@ #include <mockpp/chaining/AbstractInvocationDispatcher.h> -namespace mockpp { +MOCKPP_NS_START /** Dispatch invokables Last-In-First-Out @@ -114,19 +114,19 @@ #else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness -/** Declare a specialized class for mockpp::LIFOInvocationDispatcher. +/** Declare a specialized class for MOCKPP_NS::LIFOInvocationDispatcher. * Neccessary for compilers with weak template capabilities. */ #define MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_DECL(I) \ template<> \ -void mockpp::LIFOInvocationDispatcher<void, I >::dispatch( const I &invocation ); +void MOCKPP_NS::LIFOInvocationDispatcher<void, I >::dispatch( const I &invocation ); -/** Implement a specialized class for mockpp::LIFOInvocationDispatcher. +/** Implement a specialized class for MOCKPP_NS::LIFOInvocationDispatcher. * Neccessary for compilers with weak template capabilities. */ #define MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_IMPL(I) \ -namespace mockpp { \ +MOCKPP_NS_START \ template<> \ class LIFOInvocationDispatcher<void, I> : public AbstractInvocationDispatcher<void, I> \ { \ @@ -149,13 +149,13 @@ this->defaultStub->invoke( invocation ); \ } \ }; \ -} +MOCKPP_NS_END #endif -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_LIFOINVOCATIONDISPATCHER_H Index: gen_countchainable_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_countchainable_N.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- gen_countchainable_N.pl 18 Jan 2006 19:56:50 -0000 1.7 +++ gen_countchainable_N.pl 15 Mar 2006 21:34:02 -0000 1.8 @@ -60,7 +60,7 @@ print OUT " -namespace mockpp { +MOCKPP_NS_END #ifndef MOCKPP_COUNTED_WEAKNESS @@ -253,7 +253,7 @@ #endif // MOCKPP_COUNTED_WEAKNESS -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_COUNTEDCHAINABLEMETHOD_H Index: ChainableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject_macro.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ChainableMockObject_macro.h 6 Jan 2006 20:53:51 -0000 1.16 +++ ChainableMockObject_macro.h 15 Mar 2006 21:34:01 -0000 1.17 @@ -48,13 +48,13 @@ #define MOCKPP_CHAINER_DECL_START(classname, methname, ArgCount, ReturnType, InvocationType) \ friend class ChainerFor ## methname; \ public: \ - class ChainerFor ## methname : public mockpp::ChainingMockBuilder<mockpp::ArgumentsMatchBuilder ## ArgCount< ReturnType, InvocationType > >\ + class ChainerFor ## methname : public MOCKPP_NS::ChainingMockBuilder<MOCKPP_NS::ArgumentsMatchBuilder ## ArgCount< ReturnType, InvocationType > >\ { \ \ public: \ \ ChainerFor ## methname(classname *cls) \ - : mockpp::ChainingMockBuilder<mockpp::ArgumentsMatchBuilder ## ArgCount< ReturnType, InvocationType > >(&cls->methname ## CoreMock, cls, MOCKPP_PCHAR("ChainerFor") MOCKPP_PCHAR(# methname)) \ + : MOCKPP_NS::ChainingMockBuilder<MOCKPP_NS::ArgumentsMatchBuilder ## ArgCount< ReturnType, InvocationType > >(&cls->methname ## CoreMock, cls, MOCKPP_PCHAR("ChainerFor") MOCKPP_PCHAR(# methname)) \ { \ } \ \ @@ -101,12 +101,12 @@ a_name) \ { \ MOCKPP_STL::string func_name (#m_name); \ - mockpp::Invocation0 inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name)); \ + MOCKPP_NS::Invocation0 inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name)); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation0 m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ + typedef MOCKPP_NS::Invocation0 m_name ## InvocationType; \ + mutable MOCKPP_NS::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL0(classname, m_name, void, m_name ## InvocationType) @@ -121,12 +121,12 @@ a_name, v_type1) \ { \ MOCKPP_STL::string func_name (#m_name); \ - mockpp::Invocation1< v_type1 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ + MOCKPP_NS::Invocation1< v_type1 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation1< v_type1 > m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ + typedef MOCKPP_NS::Invocation1< v_type1 > m_name ## InvocationType; \ + mutable MOCKPP_NS::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL1(classname, m_name, void, m_name ## InvocationType) @@ -141,12 +141,12 @@ a_name, v_type1, v_type2) \ { \ 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); \ + MOCKPP_NS::Invocation2< v_type1, v_type2 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation2< v_type1, v_type2 > m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ + typedef MOCKPP_NS::Invocation2< v_type1, v_type2 > m_name ## InvocationType; \ + mutable MOCKPP_NS::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL2(classname, m_name, void, m_name ## InvocationType) @@ -165,12 +165,12 @@ a_name, v_type1, v_type2, v_type3) \ { \ 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); \ + MOCKPP_NS::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); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation3< v_type1, v_type2, v_type3 > m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ + typedef MOCKPP_NS::Invocation3< v_type1, v_type2, v_type3 > m_name ## InvocationType; \ + mutable MOCKPP_NS::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL3(classname, m_name, void, m_name ## InvocationType) @@ -191,12 +191,12 @@ a_name, v_type1, v_type2, v_type3, v_type4) \ { \ 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); \ + MOCKPP_NS::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); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation4< v_type1, v_type2, v_type3, v_type4 > m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ + typedef MOCKPP_NS::Invocation4< v_type1, v_type2, v_type3, v_type4 > m_name ## InvocationType; \ + mutable MOCKPP_NS::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL4(classname, m_name, void, m_name ## InvocationType) @@ -219,12 +219,12 @@ a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ 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); \ + MOCKPP_NS::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); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation5< v_type1, v_type2, v_type3, v_type4, v_type5 > m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ + typedef MOCKPP_NS::Invocation5< v_type1, v_type2, v_type3, v_type4, v_type5 > m_name ## InvocationType; \ + mutable MOCKPP_NS::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL5(classname, m_name, void, m_name ## InvocationType) //////////////////////////////////////////////////////////////////////////// @@ -240,12 +240,12 @@ v_ret_type, a_name) \ { \ MOCKPP_STL::string func_name (#m_name); \ - mockpp::Invocation0 inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name)); \ + MOCKPP_NS::Invocation0 inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name)); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation0 m_name ## InvocationType; \ - mutable mockpp::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ + typedef MOCKPP_NS::Invocation0 m_name ## InvocationType; \ + mutable MOCKPP_NS::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL0(classname, m_name, m_ret_type, m_name ## InvocationType) @@ -262,12 +262,12 @@ v_ret_type, a_name, v_type1) \ { \ MOCKPP_STL::string func_name (#m_name); \ - mockpp::Invocation1< v_type1 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ + MOCKPP_NS::Invocation1< v_type1 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation1< v_type1 > m_name ## InvocationType; \ - mutable mockpp::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ + typedef MOCKPP_NS::Invocation1< v_type1 > m_name ## InvocationType; \ + mutable MOCKPP_NS::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL1(classname, m_name, m_ret_type, m_name ## InvocationType) @@ -284,12 +284,12 @@ v_ret_type, a_name, v_type1, v_type2) \ { \ 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); \ + MOCKPP_NS::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); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation2< v_type1, v_type2 > m_name ## InvocationType; \ - mutable mockpp::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ + typedef MOCKPP_NS::Invocation2< v_type1, v_type2 > m_name ## InvocationType; \ + mutable MOCKPP_NS::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL2(classname, m_name, m_ret_type, m_name ## InvocationType) @@ -310,12 +310,12 @@ v_ret_type, a_name, v_type1, v_type2, v_type3) \ { \ 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); \ + MOCKPP_NS::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); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation3< v_type1, v_type2, v_type3 > m_name ## InvocationType; \ - mutable mockpp::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ + typedef MOCKPP_NS::Invocation3< v_type1, v_type2, v_type3 > m_name ## InvocationType; \ + mutable MOCKPP_NS::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL3(classname, m_name, m_ret_type, m_name ## InvocationType) @@ -338,12 +338,12 @@ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4) \ { \ 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); \ + MOCKPP_NS::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); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation4< v_type1, v_type2, v_type3, v_type4 > m_name ## InvocationType; \ - mutable mockpp::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ + typedef MOCKPP_NS::Invocation4< v_type1, v_type2, v_type3, v_type4 > m_name ## InvocationType; \ + mutable MOCKPP_NS::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL4(classname, m_name, m_ret_type, m_name ## InvocationType) @@ -368,12 +368,12 @@ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ 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); \ + MOCKPP_NS::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); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation5< v_type1, v_type2, v_type3, v_type4, v_type5 > m_name ## InvocationType; \ - mutable mockpp::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ + typedef MOCKPP_NS::Invocation5< v_type1, v_type2, v_type3, v_type4, v_type5 > m_name ## InvocationType; \ + mutable MOCKPP_NS::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL5(classname, m_name, m_ret_type, m_name ## InvocationType) Index: DynamicChainingMockError.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/DynamicChainingMockError.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- DynamicChainingMockError.h 29 Dec 2005 19:29:50 -0000 1.7 +++ DynamicChainingMockError.h 15 Mar 2006 21:34:02 -0000 1.8 @@ -45,7 +45,7 @@ #include <mockpp/compat/AssertionFailedError.h> -namespace mockpp { +MOCKPP_NS_START /** Helper class to handle chaining mock errors. @@ -117,7 +117,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_DYNAMICCHAININGMOCKERROR_H Index: StubMatchersCollection.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/StubMatchersCollection.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- StubMatchersCollection.h 29 Dec 2005 19:29:50 -0000 1.14 +++ StubMatchersCollection.h 15 Mar 2006 21:34:02 -0000 1.15 @@ -43,7 +43,7 @@ #include <mockpp/matcher/MatcherHolder.h> -namespace mockpp { +MOCKPP_NS_START /** Container of matchers for stubs. @@ -77,7 +77,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_STUBMATCHERSCOLLECTION_H Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- AbstractDynamicChainingMock.h 29 Dec 2005 19:29:50 -0000 1.40 +++ AbstractDynamicChainingMock.h 15 Mar 2006 21:34:01 -0000 1.41 @@ -47,7 +47,7 @@ #include <mockpp/compat/Exception.h> -namespace mockpp { +MOCKPP_NS_START /** Implementation of a chaining mock. @@ -169,7 +169,7 @@ /** Sets the default stub for the object * @param newDefaultStub pointer to the default stub */ - virtual void setDefaultStub( const mockpp::StubHolder<R, I> &newDefaultStub ) + virtual void setDefaultStub( const MOCKPP_NS::StubHolder<R, I> &newDefaultStub ) { invocationDispatcher->setDefaultStub( newDefaultStub ); } @@ -347,21 +347,21 @@ #else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness -/** Declare a specialized class for mockpp::AbstractDynamicChainingMock. +/** Declare a specialized class for MOCKPP_NS::AbstractDynamicChainingMock. * Neccessary for compilers with weak template capabilities. */ #define MOCKPP_ABSTRACTDYNAMICCHAININGMOCK_PTI_DECL(I) \ -namespace mockpp { \ +MOCKPP_NS_START \ template<> \ -void mockpp::AbstractDynamicChainingMock<void, I >; \ +void MOCKPP_NS::AbstractDynamicChainingMock<void, I >; \ } -/** Implement a specialized class for mockpp::AbstractDynamicChainingMock. +/** Implement a specialized class for MOCKPP_NS::AbstractDynamicChainingMock. * Neccessary for compilers with weak template capabilities. */ #define MOCKPP_ABSTRACTDYNAMICCHAININGMOCK_PTI_IMPL(I) \ -namespace mockpp { \ +MOCKPP_NS_START \ template<> \ class AbstractDynamicChainingMock<void, I> : public AbstractDynamicChainingMockImpl<void, I> \ { \ @@ -398,13 +398,13 @@ } \ } \ }; \ -} +MOCKPP_NS_END #endif -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ABSTRACTDYNAMICCHAININGMOCK_H Index: gen_chainablemethod_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_chainablemethod_N.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gen_chainablemethod_N.pl 6 Jan 2006 20:53:51 -0000 1.10 +++ gen_chainablemethod_N.pl 15 Mar 2006 21:34:02 -0000 1.11 @@ -58,7 +58,7 @@ #include <mockpp/chaining/ChainableMockMethod.h> -namespace mockpp { +MOCKPP_NS_END "; @@ -321,7 +321,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ChainableMockMethod" . $numArgs . "_H Index: DynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/DynamicChainingMock.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- DynamicChainingMock.h 29 Dec 2005 19:29:50 -0000 1.13 +++ DynamicChainingMock.h 15 Mar 2006 21:34:02 -0000 1.14 @@ -47,7 +47,7 @@ #include <mockpp/stub/StubHolder.h> -namespace mockpp { +MOCKPP_NS_START /** Interface for chaining mocks. @@ -78,7 +78,7 @@ /** Sets the default stub for the object * @param newDefaultStub pointer to the default stub */ - virtual void setDefaultStub( const mockpp::StubHolder<R, I> &newDefaultStub ) = 0; + virtual void setDefaultStub( const MOCKPP_NS::StubHolder<R, I> &newDefaultStub ) = 0; /** Adds an invokable to the mock object * @param invokable pointer to the default stub @@ -91,7 +91,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_DYNAMICCHAININGMOCK_H |
