mockpp-commits

[Mockpp-commits] mockpp/mockpp/stub CustomStub.h,1.19,1.20 DefaultResultStub.h,1.21,1.22 ReturnStub.h,1.21,1.22 Stub.h,1.7,1.8 StubHolder.h,1.12,1.13 StubSequence.h,1.29,1.30 TestFailureStub.h,1.22,1.23 ThrowStub.h,1.33,1.34 TypelessStub.h,1.18,1.19 TypelessStubSequence.h,1.11,1.12 VoidStub.cpp,1.2,1.3 VoidStub.h,1.19,1.20

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/stub
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/stub

Modified Files:
	CustomStub.h DefaultResultStub.h ReturnStub.h Stub.h 
	StubHolder.h StubSequence.h TestFailureStub.h ThrowStub.h 
	TypelessStub.h TypelessStubSequence.h VoidStub.cpp VoidStub.h 
Log Message:
optionally disable mockpp namespace

Index: VoidStub.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/VoidStub.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- VoidStub.h	29 Dec 2005 19:29:51 -0000	1.19
+++ VoidStub.h	15 Mar 2006 21:34:07 -0000	1.20
@@ -39,13 +39,13 @@
 #include <mockpp/stub/TypelessStub.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** A stub for woid methods. Not really useful but needed for compatibility.
   * May also be useful to express this property within an expectation.
   * @ingroup grp_stub
-  * @see mockpp::onConsecutiveCalls
+  * @see MOCKPP_NS::onConsecutiveCalls
   */
 class VoidStub : public TypelessStub<void>
 {
@@ -64,7 +64,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_VOIDSTUB_H

Index: StubSequence.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubSequence.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- StubSequence.h	29 Dec 2005 19:29:51 -0000	1.29
+++ StubSequence.h	15 Mar 2006 21:34:07 -0000	1.30
@@ -42,12 +42,12 @@
 #include <mockpp/compat/Asserter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Use one stub after the other from a sequence.
   * @ingroup grp_stub
-  * @see mockpp::onConsecutiveCalls
+  * @see MOCKPP_NS::onConsecutiveCalls
   */
 template <typename R,  // Returntype
           typename I>  // Invocation
@@ -120,7 +120,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_STUBSEQUENCE_H

Index: ReturnStub.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ReturnStub.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ReturnStub.h	29 Dec 2005 19:29:51 -0000	1.21
+++ ReturnStub.h	15 Mar 2006 21:34:07 -0000	1.22
@@ -41,11 +41,11 @@
 #include <mockpp/stub/TypelessStub.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 /** Always return the same specified value.
   * @ingroup grp_stub
-  * @see mockpp::returnValue
+  * @see MOCKPP_NS::returnValue
   */
 template <typename R>  // Returntype
 class ReturnStub : public TypelessStub<R>
@@ -85,7 +85,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_RETURNSTUB_H

Index: StubHolder.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubHolder.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- StubHolder.h	29 Dec 2005 19:29:51 -0000	1.12
+++ StubHolder.h	15 Mar 2006 21:34:07 -0000	1.13
@@ -39,7 +39,7 @@
 #include <mockpp/stub/TypelessStub.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Proxy class to conveniently move Stubs into Stub related methods.
@@ -99,7 +99,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_STUBHOLDER_H

Index: DefaultResultStub.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/DefaultResultStub.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- DefaultResultStub.h	29 Dec 2005 19:29:51 -0000	1.21
+++ DefaultResultStub.h	15 Mar 2006 21:34:07 -0000	1.22
@@ -39,12 +39,12 @@
 #include <mockpp/stub/TypelessStub.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** A stub returning the default value of the return type.
   * @ingroup grp_stub
-  * @see mockpp::returnValue
+  * @see MOCKPP_NS::returnValue
   */
 template <typename R>  // Returntype
 class DefaultResultStub : public TypelessStub<R>
@@ -95,7 +95,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_DEFAULTRETURNSTUB_H

Index: ThrowStub.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ThrowStub.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ThrowStub.h	29 Dec 2005 19:29:51 -0000	1.33
+++ ThrowStub.h	15 Mar 2006 21:34:07 -0000	1.34
@@ -40,12 +40,12 @@
 #include <mockpp/stub/TypelessStub.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Base for stubs throwing exceptions.
   * @ingroup grp_stub
-  * @see mockpp::throwException
+  * @see MOCKPP_NS::throwException
   */
 template <typename R>  // Returntype
 class ThrowStubBase : public TypelessStub<R>
@@ -154,7 +154,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_THROWSTUB_H

Index: Stub.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/Stub.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Stub.h	29 Dec 2005 19:29:51 -0000	1.7
+++ Stub.h	15 Mar 2006 21:34:07 -0000	1.8
@@ -45,7 +45,7 @@
 #include <mockpp/chaining/Invocation.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** An object that stubs the behaviour of an invoked method invocation on behalf of an
@@ -76,7 +76,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_STUB_H

Index: CustomStub.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/CustomStub.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- CustomStub.h	29 Dec 2005 19:29:51 -0000	1.19
+++ CustomStub.h	15 Mar 2006 21:34:07 -0000	1.20
@@ -39,7 +39,7 @@
 #include <mockpp/stub/Stub.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** A stub to implement application-specific stubs.
@@ -86,7 +86,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_CUSTOMSTUB_H

Index: VoidStub.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/VoidStub.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- VoidStub.cpp	29 Dec 2005 19:29:51 -0000	1.2
+++ VoidStub.cpp	15 Mar 2006 21:34:07 -0000	1.3
@@ -36,7 +36,7 @@
 #include <mockpp/stub/VoidStub.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 void MOCKPP_EXPORT VoidStub::typelessInvoke( )
@@ -51,5 +51,5 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 

Index: TypelessStubSequence.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStubSequence.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- TypelessStubSequence.h	29 Dec 2005 19:29:51 -0000	1.11
+++ TypelessStubSequence.h	15 Mar 2006 21:34:07 -0000	1.12
@@ -38,12 +38,12 @@
 #include <mockpp/compat/Asserter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Use one stub after the other from a sequence.
   * @ingroup grp_stub
-  * @see mockpp::throwException
+  * @see MOCKPP_NS::throwException
   */
 template <typename R>  // Invocation
 class TypelessStubSequence : public TypelessStub<R>
@@ -112,7 +112,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_TypelessStubSequence_H

Index: TypelessStub.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStub.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- TypelessStub.h	29 Dec 2005 19:29:51 -0000	1.18
+++ TypelessStub.h	15 Mar 2006 21:34:07 -0000	1.19
@@ -39,7 +39,7 @@
 #include <mockpp/SelfDescribing.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** An object that stubs the behaviour of an invoked method invocation on behalf of an
@@ -183,21 +183,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_TYPELESSSTUBADAPTER_PTI_DECL(I) \
-namespace mockpp { \
+MOCKPP_NS_START \
 template<> \
-void mockpp::TypelessStubAdapter<void, I >; \
+void MOCKPP_NS::TypelessStubAdapter<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_TYPELESSSTUBADAPTER_PTI_IMPL(I) \
-namespace mockpp { \
+MOCKPP_NS_START \
 template<> \
 class TypelessStubAdapter<void, I > : public TypelessStubAdapterBase<void, I > \
 { \
@@ -212,13 +212,13 @@
    this->stubber->typelessInvoke(); \
   } \
 }; \
-}
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_PTI_WEAKNESS
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_TypelessStub_H

Index: TestFailureStub.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TestFailureStub.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- TestFailureStub.h	29 Dec 2005 19:29:51 -0000	1.22
+++ TestFailureStub.h	15 Mar 2006 21:34:07 -0000	1.23
@@ -40,12 +40,12 @@
 #include <mockpp/compat/AssertionFailedError.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Stub that always fails upon invocation.
   * @ingroup grp_stub
-  * @see mockpp::never
+  * @see MOCKPP_NS::never
   */
 template <typename R,  // Returntype
           typename I>  // Invocation
@@ -89,7 +89,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_TESTFAILURESTUB_H

[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

[Ewald A. <ewa...@us...>]

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

[Mockpp-commits] mockpp/mockpp/constraint And.h,1.21,1.22 Constraint.h,1.8,1.9 ConstraintHolder.h,1.9,1.10 ConstraintList.h,1.8,1.9 ConstraintSet.cpp,1.2,1.3 ConstraintSet.h,1.17,1.18 ConstraintSetN.h,1.6,1.7 IsAnything.cpp,1.3,1.4 IsAnything.h,1.20,1.21 IsCloseTo.h,1.19,1.20 IsEqual.h,1.22,1.23 IsGreaterOrEqual.h,1.12,1.13 IsGreaterThan.h,1.16,1.17 IsInstanceOf.h,1.19,1.20 IsLessOrEqual.h,1.13,1.14 IsLessThan.h,1.16,1.17 IsNot.h,1.20,1.21 IsNothing.cpp,1.3,1.4 IsNothing.h,1.18,1.19 IsSame.h,1.21,1.22 Or.h,1.19,1.20 OutBound.h,1.2,1.3 StringContains.h,1.17,1.18 StringEndsWith.h,1.3,1.4 StringStartsWith.h,1.2,1.3 TypelessConstraint.cpp,1.2,1.3 TypelessConstraint.h,1.9,1.10 gen_constraintset_N.pl,1.2,1.3

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/constraint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/constraint

Modified Files:
	And.h Constraint.h ConstraintHolder.h ConstraintList.h 
	ConstraintSet.cpp ConstraintSet.h ConstraintSetN.h 
	IsAnything.cpp IsAnything.h IsCloseTo.h IsEqual.h 
	IsGreaterOrEqual.h IsGreaterThan.h IsInstanceOf.h 
	IsLessOrEqual.h IsLessThan.h IsNot.h IsNothing.cpp IsNothing.h 
	IsSame.h Or.h OutBound.h StringContains.h StringEndsWith.h 
	StringStartsWith.h TypelessConstraint.cpp TypelessConstraint.h 
	gen_constraintset_N.pl 
Log Message:
optionally disable mockpp namespace

Index: IsAnything.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsAnything.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- IsAnything.cpp	29 Dec 2005 19:29:51 -0000	1.3
+++ IsAnything.cpp	15 Mar 2006 21:34:03 -0000	1.4
@@ -36,7 +36,7 @@
 #include <mockpp/constraint/IsAnything.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 MOCKPP_EXPORT IsAnything::IsAnything()
@@ -69,4 +69,4 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END

Index: ConstraintList.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintList.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ConstraintList.h	29 Dec 2005 19:29:51 -0000	1.8
+++ ConstraintList.h	15 Mar 2006 21:34:03 -0000	1.9
@@ -45,7 +45,7 @@
 #include <mockpp/constraint/IsAnything.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** A class to verify lists of constraints, one after the other as they occur.
@@ -290,7 +290,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ConstraintList_H

Index: IsGreaterOrEqual.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsGreaterOrEqual.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- IsGreaterOrEqual.h	29 Dec 2005 19:29:51 -0000	1.12
+++ IsGreaterOrEqual.h	15 Mar 2006 21:34:03 -0000	1.13
@@ -36,12 +36,12 @@
 #include <mockpp/compat/Formatter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Is the value greater or equal than another value?
   * @ingroup grp_constraint
-  * @see mockpp::ge
+  * @see MOCKPP_NS::ge
   */
 template <typename T>
 class IsGreaterOrEqual : public Constraint<T>
@@ -84,7 +84,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ISGREATEROREQUAL_H

Index: StringStartsWith.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/StringStartsWith.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- StringStartsWith.h	6 Jan 2005 13:09:22 -0000	1.2
+++ StringStartsWith.h	15 Mar 2006 21:34:03 -0000	1.3
@@ -36,14 +36,14 @@
 #include <mockpp/compat/Formatter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Tests if the argument is a string that contains a substring.
   * @ingroup grp_constraint
-  * @see mockpp::startsWith
+  * @see MOCKPP_NS::startsWith
   */
-template <typename StringType = mockpp::String>
+template <typename StringType = MOCKPP_NS::String>
 class StringStartsWith : public Constraint<StringType>
 {
   public:
@@ -89,7 +89,7 @@
  };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_STRINGSTARTSWITH_H

Index: OutBound.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/OutBound.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- OutBound.h	29 Dec 2005 19:29:51 -0000	1.2
+++ OutBound.h	15 Mar 2006 21:34:03 -0000	1.3
@@ -37,7 +37,7 @@
 #include <mockpp/ReturnObjectList.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Passes a value back via a reference (outbound value).
@@ -106,7 +106,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_OutBound_H

Index: StringContains.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/StringContains.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- StringContains.h	29 Dec 2005 19:29:51 -0000	1.17
+++ StringContains.h	15 Mar 2006 21:34:03 -0000	1.18
@@ -40,14 +40,14 @@
 #include <mockpp/compat/Formatter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Tests if the argument is a string that contains a substring.
   * @ingroup grp_constraint
-  * @see mockpp::stringContains
+  * @see MOCKPP_NS::stringContains
   */
-template <typename StringType = mockpp::String>
+template <typename StringType = MOCKPP_NS::String>
 class StringContains : public Constraint<StringType>
 {
   public:
@@ -93,7 +93,7 @@
  };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_STRINGCONTAINS_H

Index: IsGreaterThan.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsGreaterThan.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- IsGreaterThan.h	29 Dec 2005 19:29:51 -0000	1.16
+++ IsGreaterThan.h	15 Mar 2006 21:34:03 -0000	1.17
@@ -40,12 +40,12 @@
 #include <mockpp/compat/Formatter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Is the value greater than another value?
   * @ingroup grp_constraint
-  * @see mockpp::gt
+  * @see MOCKPP_NS::gt
   */
 template <typename T>
 class IsGreaterThan : public Constraint<T>
@@ -88,7 +88,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ISGREATER_H

Index: gen_constraintset_N.pl
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/gen_constraintset_N.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gen_constraintset_N.pl	29 Dec 2005 19:29:51 -0000	1.2
+++ gen_constraintset_N.pl	15 Mar 2006 21:34:03 -0000	1.3
@@ -13,14 +13,14 @@
 $totalNumArgs = $ARGV[0];
 if ($totalNumArgs < 5) {
   $totalNumArgs = 5; }
-  
+
 open OUT, ">ConstraintSetN.h";
 
-print OUT 
+print OUT
 "/** \@file
     \@internal NOT INTENDED FOR PUBLIC INCLUSION
     \@brief    Generated with gen_constraintset_N.pl.
-             
+
   \$I" . "d: ConstraintSetN.h,v 1.7 2005/10/19 20:53:09 ewald-arnold Exp \$
 
  ***************************************************************************/
@@ -53,7 +53,7 @@
 //#include <mockpp/builder/ConstraintSet.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 ";
 
 for ($numArgs = 1; $numArgs <= $totalNumArgs; ++$numArgs) {
@@ -66,18 +66,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) {
@@ -112,7 +112,7 @@
     $args .= "p$i";
   }
 
-  
+
   $boundArgs = "";
   for ($i = 1; $i <= $numArgs; ++$i) {
     if ($i > 1) {
@@ -127,7 +127,7 @@
     $argsAsMembers .= "P$i p$i;";
   }
 
-  
+
   $copyParms = "";
   for ($i = 1; $i <= $numArgs; ++$i) {
     if ($i > 1) {
@@ -145,7 +145,7 @@
     $hArgs .= "h$i";
   }
 
-  
+
   $initArgs = "";
   if ($numArgs > 0) {
       $initArgs = ":";
@@ -157,14 +157,14 @@
     $initArgs .= "p$i(ip$i)";
   }
 
-  
+
   $argTypes = "";
   for ($i = 1; $i <= $numArgs; ++$i) {
     $argTypes .= "typedef P$i p". ($i+1) . "_type; "; }
 
 
 print "Creating ConstraintSet" . $numArgs ."\n";
-    
+
 print OUT "
 
 /** A set of constraints for a method with " . $numArgs . " arguments
@@ -182,21 +182,21 @@
 print OUT "
 
   /** Constructs the object";
-  
+
 for($p = 1; $p <= $numArgs; ++$p) { print OUT "
     * \@param  in_constraint" . $p . "  constraint " . $p . ""; }
 
 print OUT "
     */
     ConstraintSet" . $numArgs . "(  const ConstraintHolder<P1> &in_constraint1";
-    
+
 for($p = 2; $p <= $numArgs; ++$p) { print OUT "
-                   , const ConstraintHolder<P" . $p . "> &in_constraint" . $p; } 
+                   , const ConstraintHolder<P" . $p . "> &in_constraint" . $p; }
 
 print OUT ")
-        : constraint1( in_constraint1 )"; 
-        
-    
+        : constraint1( in_constraint1 )";
+
+
 for($p = 2; $p <= $numArgs; ++$p) { print OUT "
         , constraint" . $p . "( in_constraint" . $p . " )"; }
 
@@ -216,7 +216,7 @@
     bool matches( const I &invocation )
     {
       return    constraint1->eval( invocation.getParameter1() )";
-      
+
 for($p = 2; $p <= $numArgs; ++$p) { print OUT "
              && constraint" . $p . "->eval( invocation.getParameter" . $p . "() )"; }
 
@@ -254,7 +254,7 @@
 
 print OUT "
 
-}  // ns mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ConstraintSet_N_H

Index: IsNot.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsNot.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- IsNot.h	29 Dec 2005 19:29:51 -0000	1.20
+++ IsNot.h	15 Mar 2006 21:34:03 -0000	1.21
@@ -39,12 +39,12 @@
 #include <mockpp/constraint/ConstraintHolder.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Calculates the logical negation of a constraint.
   * @ingroup grp_constraint
-  * @see mockpp::ne
+  * @see MOCKPP_NS::ne
   */
 template <typename T>
 class IsNot : public Constraint<T>
@@ -90,7 +90,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ISNOT_H

Index: TypelessConstraint.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/TypelessConstraint.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TypelessConstraint.cpp	29 Dec 2005 19:29:51 -0000	1.2
+++ TypelessConstraint.cpp	15 Mar 2006 21:34:03 -0000	1.3
@@ -33,7 +33,7 @@
 #include <mockpp/constraint/TypelessConstraint.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 MOCKPP_EXPORT TypelessConstraint::~TypelessConstraint()
@@ -41,5 +41,5 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 

Index: IsAnything.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsAnything.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- IsAnything.h	29 Dec 2005 19:29:51 -0000	1.20
+++ IsAnything.h	15 Mar 2006 21:34:03 -0000	1.21
@@ -39,12 +39,12 @@
 #include <mockpp/constraint/TypelessConstraint.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** A constraint that always returns <code>true</code>.
   * @ingroup grp_constraint
-  * @see mockpp::any
+  * @see MOCKPP_NS::any
   */
 class IsAnything : public TypelessConstraint
 {
@@ -78,7 +78,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif //MOCKPP_ISANYTHING_H

Index: IsEqual.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsEqual.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- IsEqual.h	29 Dec 2005 19:29:51 -0000	1.22
+++ IsEqual.h	15 Mar 2006 21:34:03 -0000	1.23
@@ -40,14 +40,14 @@
 #include <mockpp/compat/Formatter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Default comparison function for \c IsEqual.
   * The default implementation compares the values of the two
   * objects.
   * @ingroup grp_constraint
-  * @see mockpp::IsEqual
+  * @see MOCKPP_NS::IsEqual
   * @param left  left operand
   * @param right right operand
   * @return true if both values are equal
@@ -63,8 +63,8 @@
   * invoked method? Basically the same as \c IsSame which compares
   * by reference and a specializable comparison template.
   * @ingroup grp_constraint
-  * @see mockpp::eq( const T& op )
-  * @see mockpp::IsSame
+  * @see MOCKPP_NS::eq( const T& op )
+  * @see MOCKPP_NS::IsSame
   */
 template <typename T>
 class IsEqual : public Constraint<T>
@@ -111,7 +111,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ISEQUAL_H

Index: TypelessConstraint.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/TypelessConstraint.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- TypelessConstraint.h	29 Dec 2005 19:29:51 -0000	1.9
+++ TypelessConstraint.h	15 Mar 2006 21:34:03 -0000	1.10
@@ -38,7 +38,7 @@
 #include <mockpp/constraint/Constraint.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** A constraint where actual values are ignored.
@@ -111,7 +111,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_TYPELESSCONSTRAINT_H

Index: ConstraintSet.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintSet.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ConstraintSet.h	29 Dec 2005 19:29:51 -0000	1.17
+++ ConstraintSet.h	15 Mar 2006 21:34:03 -0000	1.18
@@ -38,7 +38,7 @@
 #include <mockpp/mockpp.h> // always first
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 /** A set of constraints for a method without arguments
   * @internal
@@ -72,7 +72,7 @@
 
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_CONSTRAINTSET_H

Index: Constraint.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/Constraint.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Constraint.h	29 Dec 2005 19:29:51 -0000	1.8
+++ Constraint.h	15 Mar 2006 21:34:03 -0000	1.9
@@ -41,7 +41,7 @@
 #include <mockpp/SelfDescribing.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** A constraint over acceptable values.
@@ -70,7 +70,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_CONSTRAINT_H

Index: IsCloseTo.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsCloseTo.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- IsCloseTo.h	29 Dec 2005 19:29:51 -0000	1.19
+++ IsCloseTo.h	15 Mar 2006 21:34:03 -0000	1.20
@@ -40,13 +40,13 @@
 #include <mockpp/compat/Formatter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Is the value of a number equal to a value within some range of
   * acceptable deviation?
   * @ingroup grp_constraint
-  * @see mockpp::eq( const T &operand, const T &deviation )
+  * @see MOCKPP_NS::eq( const T &operand, const T &deviation )
   */
 template <typename NumberType>
 class IsCloseTo : public Constraint<NumberType>
@@ -93,7 +93,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ISCLOSETO_H

Index: IsLessThan.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsLessThan.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- IsLessThan.h	29 Dec 2005 19:29:51 -0000	1.16
+++ IsLessThan.h	15 Mar 2006 21:34:03 -0000	1.17
@@ -40,11 +40,11 @@
 #include <mockpp/compat/Formatter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 /** Is the value less than another value?
   * @ingroup grp_constraint
-  * @see mockpp::lt
+  * @see MOCKPP_NS::lt
   */
 template <typename T>
 class IsLessThan : public Constraint<T>
@@ -87,7 +87,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ISLESSTHAN_H

Index: IsNothing.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsNothing.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- IsNothing.h	29 Dec 2005 19:29:51 -0000	1.18
+++ IsNothing.h	15 Mar 2006 21:34:03 -0000	1.19
@@ -39,12 +39,12 @@
 #include <mockpp/constraint/TypelessConstraint.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** A constraint which is never true.
   * @ingroup grp_constraint
-  * @see mockpp::nothing
+  * @see MOCKPP_NS::nothing
   */
 class IsNothing : public TypelessConstraint
 {
@@ -81,7 +81,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ISNOTHING_H

Index: IsSame.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsSame.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- IsSame.h	29 Dec 2005 19:29:51 -0000	1.21
+++ IsSame.h	15 Mar 2006 21:34:03 -0000	1.22
@@ -40,14 +40,14 @@
 #include <mockpp/compat/Formatter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Default comparison function for \c IsSame.
   * The default implementation compares the adresses of the two
   * objects.
   * @ingroup grp_constraint
-  * @see mockpp::IsSame
+  * @see MOCKPP_NS::IsSame
   * @param left  left operand
   * @param right right operand
   * @return true if both operands are equal
@@ -64,9 +64,9 @@
   * \c IsSame compares by reference and a comparison template which can be
   * specialized.
   * @ingroup grp_constraint
-  * @see mockpp::same
-  * @see mockpp::IsEqual
-  * @see mockpp::isSameComparison
+  * @see MOCKPP_NS::same
+  * @see MOCKPP_NS::IsEqual
+  * @see MOCKPP_NS::isSameComparison
   */
 template <typename T>
 class IsSame : public Constraint<T>
@@ -113,7 +113,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ISSAME_H

Index: IsLessOrEqual.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsLessOrEqual.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- IsLessOrEqual.h	29 Dec 2005 19:29:51 -0000	1.13
+++ IsLessOrEqual.h	15 Mar 2006 21:34:03 -0000	1.14
@@ -36,12 +36,12 @@
 #include <mockpp/compat/Formatter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Is the value less or equal than another value?
   * @ingroup grp_constraint
-  * @see mockpp::le
+  * @see MOCKPP_NS::le
   */
 template <typename T>
 class IsLessOrEqual : public Constraint<T>
@@ -84,7 +84,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ISLESSOREQUAL_H

Index: StringEndsWith.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/StringEndsWith.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- StringEndsWith.h	29 Dec 2005 19:29:51 -0000	1.3
+++ StringEndsWith.h	15 Mar 2006 21:34:03 -0000	1.4
@@ -36,14 +36,14 @@
 #include <mockpp/compat/Formatter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Tests if the argument is a string that contains a substring.
   * @ingroup grp_constraint
-  * @see mockpp::endsWith
+  * @see MOCKPP_NS::endsWith
   */
-template <typename StringType = mockpp::String>
+template <typename StringType = MOCKPP_NS::String>
 class StringEndsWith : public Constraint<StringType>
 {
   public:
@@ -94,7 +94,7 @@
  };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_STRINGENDSWITH_H

Index: IsInstanceOf.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsInstanceOf.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- IsInstanceOf.h	29 Dec 2005 19:29:51 -0000	1.19
+++ IsInstanceOf.h	15 Mar 2006 21:34:03 -0000	1.20
@@ -39,7 +39,7 @@
 #include <mockpp/constraint/Constraint.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 #ifndef MOCKPP_NO_RTTI
@@ -48,7 +48,7 @@
   * A base class is needed since dynamic_cast checks for an existing traversal
   * from \c derived to \c base.
   * @ingroup grp_constraint
-  * @see mockpp::isA
+  * @see MOCKPP_NS::isA
   */
 template <typename BASE,
           typename DERIVED>
@@ -82,7 +82,7 @@
 
 #endif // MOCKPP_NO_RTTI
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ISINSTANCEOF_H

Index: IsNothing.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsNothing.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- IsNothing.cpp	29 Dec 2005 19:29:51 -0000	1.3
+++ IsNothing.cpp	15 Mar 2006 21:34:03 -0000	1.4
@@ -36,7 +36,7 @@
 #include <mockpp/constraint/IsNothing.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 MOCKPP_EXPORT IsNothing::IsNothing()
@@ -69,4 +69,4 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END

Index: Or.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/Or.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Or.h	29 Dec 2005 19:29:51 -0000	1.19
+++ Or.h	15 Mar 2006 21:34:03 -0000	1.20
@@ -39,14 +39,14 @@
 #include <mockpp/constraint/ConstraintHolder.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Calculates the logical disjunction of two constraints. Evaluation is
   * shortcut, so that the second constraint is not called if the first
   * constraint returns <code>true</code>.
   * @ingroup grp_constraint
-  * @see mockpp::logic_or
+  * @see MOCKPP_NS::logic_or
   */
 template <typename T>
 class Or : public Constraint<T>
@@ -99,7 +99,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_OR_H

Index: And.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/And.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- And.h	29 Dec 2005 19:29:51 -0000	1.21
+++ And.h	15 Mar 2006 21:34:03 -0000	1.22
@@ -39,7 +39,7 @@
 #include <mockpp/constraint/ConstraintHolder.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Calculates the logical conjunction of two constraints. Evaluation is
@@ -97,7 +97,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_AND_H

Index: ConstraintSet.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintSet.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ConstraintSet.cpp	29 Dec 2005 19:29:51 -0000	1.2
+++ ConstraintSet.cpp	15 Mar 2006 21:34:03 -0000	1.3
@@ -33,7 +33,7 @@
 #include <mockpp/constraint/ConstraintSet.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 String MOCKPP_EXPORT ConstraintSet0::describeTo( String &buffer ) const
@@ -42,5 +42,5 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 

Index: ConstraintSetN.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintSetN.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ConstraintSetN.h	29 Dec 2005 19:29:51 -0000	1.6
+++ ConstraintSetN.h	15 Mar 2006 21:34:03 -0000	1.7
@@ -1,7 +1,7 @@
 /** @file
     @internal NOT INTENDED FOR PUBLIC INCLUSION
     @brief    Generated with gen_constraintset_N.pl.
-             
+
   $Id$
 
  ***************************************************************************/
@@ -34,7 +34,7 @@
 //#include <mockpp/builder/ConstraintSet.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** A set of constraints for a method with 1 arguments
@@ -442,7 +442,7 @@
 };
 
 
-}  // ns mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ConstraintSet_N_H

Index: ConstraintHolder.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintHolder.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ConstraintHolder.h	29 Dec 2005 19:29:51 -0000	1.9
+++ ConstraintHolder.h	15 Mar 2006 21:34:03 -0000	1.10
@@ -39,7 +39,7 @@
 #include <mockpp/constraint/TypelessConstraint.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Proxy class to conveniently move constraints into constraint sets.
@@ -98,7 +98,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_CONSTRAINTHOLDER_H

[Mockpp-commits] mockpp/mockpp/util AssertMo.cpp,1.24,1.25 AssertMo.h,1.26,1.27 AutoPointer.h,1.15,1.16 NotImplementedException.cpp,1.21,1.22 NotImplementedException.h,1.15,1.16

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/util

Modified Files:
	AssertMo.cpp AssertMo.h AutoPointer.h 
	NotImplementedException.cpp NotImplementedException.h 
Log Message:
optionally disable mockpp namespace

Index: AssertMo.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- AssertMo.cpp	29 Dec 2005 19:29:52 -0000	1.24
+++ AssertMo.cpp	15 Mar 2006 21:34:09 -0000	1.25
@@ -38,7 +38,7 @@
 #include <mockpp/util/NotImplementedException.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 void MOCKPP_EXPORT assertExcludes(unsigned srcline, const char* srcfile,
@@ -122,11 +122,11 @@
 void MOCKPP_EXPORT notImplemented(unsigned srcline, const char* srcfile,
                                   const String &mockName)
 {
-  mockpp::String fmt = mockpp_i18n(MOCKPP_PCHAR("Not Implemented in %1."));
+  MOCKPP_NS::String fmt = mockpp_i18n(MOCKPP_PCHAR("Not Implemented in %1."));
   fmt << mockName;
   MOCKPP_THROW(NotImplementedException(srcline, srcfile, fmt));
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 

Index: AssertMo.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- AssertMo.h	29 Dec 2005 19:29:52 -0000	1.26
+++ AssertMo.h	15 Mar 2006 21:34:09 -0000	1.27
@@ -36,7 +36,7 @@
 #include <mockpp/compat/Formatter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 class Verifiable;
@@ -158,7 +158,7 @@
                     const String &mockName);
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 /** Asserts that a string does contain a substring. If it does not it throws
@@ -168,7 +168,7 @@
   * @param a             string which must occur at the beginning
   * @param b             string in which is searched
   */
-#define MOCKPP_ASSERT_INCLUDES_MESSAGE(msg, a, b)  mockpp::assertIncludes(__LINE__, __FILE__, msg, a, b)
+#define MOCKPP_ASSERT_INCLUDES_MESSAGE(msg, a, b)  MOCKPP_NS::assertIncludes(__LINE__, __FILE__, msg, a, b)
 
 /** @def MOCKPP_ASSERT_INCLUDES
   * Asserts that a string does contain a substring. If it does not it throws
@@ -179,7 +179,7 @@
   * @param b             string in which is searched
   */
 
-# define MOCKPP_ASSERT_INCLUDES(a, b)  mockpp::assertIncludes(__LINE__, __FILE__, MOCKPP_PCHAR(#a) MOCKPP_PCHAR(" <in> ") MOCKPP_PCHAR(#b), a, b)
+# define MOCKPP_ASSERT_INCLUDES(a, b)  MOCKPP_NS::assertIncludes(__LINE__, __FILE__, MOCKPP_PCHAR(#a) MOCKPP_PCHAR(" <in> ") MOCKPP_PCHAR(#b), a, b)
 
 /** Asserts that a string does not contain a substring. If it does it throws
   * an AssertionFailedError with the given infomation.
@@ -188,7 +188,7 @@
   * @param a             string which must occur at the beginning
   * @param b             string in which is searched
   */
-#define MOCKPP_ASSERT_EXCLUDES_MESSAGE(msg, a, b)  mockpp::assertExcludes(__LINE__, __FILE__, msg, a, b)
+#define MOCKPP_ASSERT_EXCLUDES_MESSAGE(msg, a, b)  MOCKPP_NS::assertExcludes(__LINE__, __FILE__, msg, a, b)
 
 /** @def MOCKPP_ASSERT_EXCLUDES
   * Asserts that a string does not contain a substring. If it does it throws
@@ -199,7 +199,7 @@
   * @param b             string in which is searched
   */
 
-#define MOCKPP_ASSERT_EXCLUDES(a, b)  mockpp::assertExcludes(__LINE__, __FILE__, MOCKPP_PCHAR(#a) MOCKPP_PCHAR(" <!in> ") MOCKPP_PCHAR(#b), a, b)
+#define MOCKPP_ASSERT_EXCLUDES(a, b)  MOCKPP_NS::assertExcludes(__LINE__, __FILE__, MOCKPP_PCHAR(#a) MOCKPP_PCHAR(" <!in> ") MOCKPP_PCHAR(#b), a, b)
 
 /** Asserts that a string starts with a substring. If it does not it throws
   * an AssertionFailedError with the given infomation.
@@ -208,7 +208,7 @@
   * @param a             string which must occur at the beginning
   * @param b             string in which is searched
   */
-#define MOCKPP_ASSERT_STARTSWITH_MESSAGE(msg, a, b)  mockpp::assertStartsWith(__LINE__, __FILE__, msg, a, b)
+#define MOCKPP_ASSERT_STARTSWITH_MESSAGE(msg, a, b)  MOCKPP_NS::assertStartsWith(__LINE__, __FILE__, msg, a, b)
 
 /** @def MOCKPP_ASSERT_STARTSWITH
   * Asserts that a string starts with a substring. If it does not it throws
@@ -219,21 +219,21 @@
   * @param b             string in which is searched
   */
 
-#define MOCKPP_ASSERT_STARTSWITH(a, b)  mockpp::assertStartsWith(__LINE__, __FILE__, MOCKPP_PCHAR(#a) MOCKPP_PCHAR(" <starts> ") MOCKPP_PCHAR(#b), a, b)
+#define MOCKPP_ASSERT_STARTSWITH(a, b)  MOCKPP_NS::assertStartsWith(__LINE__, __FILE__, MOCKPP_PCHAR(#a) MOCKPP_PCHAR(" <starts> ") MOCKPP_PCHAR(#b), a, b)
 
 /** Asserts that a verify() of an object fails. If it does not it throws
   * an AssertionFailedError.
   * @ingroup grp_helper
   * @param obj   object to be verified
   */
-#define MOCKPP_ASSERT_VERIFYFAILS(obj)  mockpp::assertVerifyFails(__LINE__, __FILE__, obj)
+#define MOCKPP_ASSERT_VERIFYFAILS(obj)  MOCKPP_NS::assertVerifyFails(__LINE__, __FILE__, obj)
 
 /** Throws unconditionally a NotImplementedException with the given name to
   * indicate a not yet implemented method.
   * @ingroup grp_helper
   * @param msg   name of the object
   */
-#define MOCKPP_NOT_IMPLEMENTED(msg)  mockpp::notImplemented(__LINE__, __FILE__, msg)
+#define MOCKPP_NOT_IMPLEMENTED(msg)  MOCKPP_NS::notImplemented(__LINE__, __FILE__, msg)
 
 // @todo test
 /** Asserts that an exception is thrown and that the data is correctly

Index: AutoPointer.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AutoPointer.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- AutoPointer.h	29 Dec 2005 19:29:52 -0000	1.15
+++ AutoPointer.h	15 Mar 2006 21:34:09 -0000	1.16
@@ -34,7 +34,7 @@
 #include <mockpp/mockpp.h> // always first
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 /** Implementation of an auto-pointer class.
   * 99% re-implemented from std::auto_ptr. The main difference is the
@@ -133,7 +133,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_AUTOPOINTER_H

Index: NotImplementedException.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/util/NotImplementedException.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- NotImplementedException.cpp	29 Dec 2005 19:29:52 -0000	1.21
+++ NotImplementedException.cpp	15 Mar 2006 21:34:09 -0000	1.22
@@ -33,7 +33,7 @@
 #include <mockpp/util/NotImplementedException.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
  
 
 MOCKPP_EXPORT
@@ -44,7 +44,7 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 

Index: NotImplementedException.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/util/NotImplementedException.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- NotImplementedException.h	29 Dec 2005 19:29:52 -0000	1.15
+++ NotImplementedException.h	15 Mar 2006 21:34:09 -0000	1.16
@@ -36,7 +36,7 @@
 #include <mockpp/compat/AssertionFailedError.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Signal not-yet implemented methods.
@@ -55,7 +55,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_NOTIMPLEMENTEDEXCEPTION_H

[Mockpp-commits] mockpp/mockpp/builder ArgumentsMatchBuilder.h,1.31,1.32 ArgumentsMatchBuilderN.h,1.8,1.9 BuilderNamespace.cpp,1.5,1.6 BuilderNamespace.h,1.26,1.27 IdentityBuilder.cpp,1.3,1.4 IdentityBuilder.h,1.12,1.13 InvocationMockerBuilder.h,1.37,1.38 MatchBuilder.h,1.37,1.38 StubBuilder.h,1.25,1.26 gen_argumentsmatchbuilder_N.pl,1.3,1.4

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/builder

Modified Files:
	ArgumentsMatchBuilder.h ArgumentsMatchBuilderN.h 
	BuilderNamespace.cpp BuilderNamespace.h IdentityBuilder.cpp 
	IdentityBuilder.h InvocationMockerBuilder.h MatchBuilder.h 
	StubBuilder.h gen_argumentsmatchbuilder_N.pl 
Log Message:
optionally disable mockpp namespace

Index: gen_argumentsmatchbuilder_N.pl
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/gen_argumentsmatchbuilder_N.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gen_argumentsmatchbuilder_N.pl	29 Dec 2005 19:29:50 -0000	1.3
+++ gen_argumentsmatchbuilder_N.pl	15 Mar 2006 21:34:01 -0000	1.4
@@ -13,14 +13,14 @@
 $totalNumArgs = $ARGV[0];
 if ($totalNumArgs < 5) {
   $totalNumArgs = 5; }
-  
+
 open OUT, ">ArgumentsMatchBuilderN.h";
 
-print OUT 
+print OUT
 "/** \@file
     \@internal NOT INTENDED FOR PUBLIC INCLUSION
     \@brief    Generated with gen_argumentsmatchbuilder_N.pl.
-             
+
   \$I" . "d: InvocationN.h,v 1.7 2005/10/19 20:53:09 ewald-arnold Exp \$
 
  ***************************************************************************/
@@ -53,7 +53,7 @@
 //#include <mockpp/builder/ArgumentsMatchBuilder.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 ";
 
@@ -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 ArgumentsMatchBuilder" . $numArgs ."\n";
-    
+
 print OUT "
 /** Build a matcher for an invocation with " . $numArgs ." argument.
   * \@ingroup grp_chainer
@@ -179,7 +179,7 @@
 
     typedef R ReturnType;
     typedef I InvocationType;";
-    
+
 for($p = 1; $p <= $numArgs; ++$p) { print OUT "
     typedef typename I::T" .$p . "Type P" .$p . ";"; }
 
@@ -203,7 +203,7 @@
     * \@return the builder object
     */
     MatchBuilder<R, I>& with(  const ConstraintHolder<P1> &p1";
-                             
+
 for($p = 2; $p <= $numArgs; ++$p) { print OUT "
                              , const ConstraintHolder<P" .$p . "> &p" .$p; }
 
@@ -227,7 +227,7 @@
 
 print OUT "
 
-}  // ns mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ARGUMENTSMATCHBUILDER_N_H

Index: IdentityBuilder.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/IdentityBuilder.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- IdentityBuilder.h	29 Dec 2005 19:29:50 -0000	1.12
+++ IdentityBuilder.h	15 Mar 2006 21:34:01 -0000	1.13
@@ -39,7 +39,7 @@
 #include <mockpp/mockpp.h> // always first
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Builder class for identity related purposes.
@@ -61,7 +61,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_IDENTITYBUILDER_H

Index: ArgumentsMatchBuilderN.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/ArgumentsMatchBuilderN.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ArgumentsMatchBuilderN.h	29 Dec 2005 19:29:50 -0000	1.8
+++ ArgumentsMatchBuilderN.h	15 Mar 2006 21:34:01 -0000	1.9
@@ -1,7 +1,7 @@
 /** @file
     @internal NOT INTENDED FOR PUBLIC INCLUSION
     @brief    Generated with gen_argumentsmatchbuilder_N.pl.
-             
+
   $Id$
 
  ***************************************************************************/
@@ -34,7 +34,7 @@
 //#include <mockpp/builder/ArgumentsMatchBuilder.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Build a matcher for an invocation with 1 argument.
@@ -335,7 +335,7 @@
 
 
 
-}  // ns mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ARGUMENTSMATCHBUILDER_N_H

Index: ArgumentsMatchBuilder.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/ArgumentsMatchBuilder.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ArgumentsMatchBuilder.h	29 Dec 2005 19:29:50 -0000	1.31
+++ ArgumentsMatchBuilder.h	15 Mar 2006 21:34:01 -0000	1.32
@@ -48,7 +48,7 @@
 #include <mockpp/matcher/MatcherHolder.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
   
 /** Build a matcher for an invocation with no arguments.
@@ -90,7 +90,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ARGUMENTSMATCHBUILDER_H

Index: InvocationMockerBuilder.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/InvocationMockerBuilder.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- InvocationMockerBuilder.h	29 Dec 2005 19:29:50 -0000	1.37
+++ InvocationMockerBuilder.h	15 Mar 2006 21:34:01 -0000	1.38
@@ -49,7 +49,7 @@
 #include <mockpp/chaining/StubMatchersCollection.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 /** Builder class for invocation related purposes.
   * @ingroup grp_chainer
@@ -165,7 +165,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_INVOCATIONBUILDER_H

Index: BuilderNamespace.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/BuilderNamespace.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- BuilderNamespace.cpp	29 Dec 2005 19:29:50 -0000	1.5
+++ BuilderNamespace.cpp	15 Mar 2006 21:34:01 -0000	1.6
@@ -37,7 +37,7 @@
 #include <mockpp/builder/BuilderNamespace.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 MOCKPP_EXPORT BuilderNamespace::BuilderNamespace(const String &in_name)
@@ -57,4 +57,4 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END

Index: BuilderNamespace.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/BuilderNamespace.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- BuilderNamespace.h	29 Dec 2005 19:29:50 -0000	1.26
+++ BuilderNamespace.h	15 Mar 2006 21:34:01 -0000	1.27
@@ -42,7 +42,7 @@
 #include <mockpp/matcher/InvokedRecorder.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 class MatchBuilderAdapterBase;
@@ -108,7 +108,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_BUILDERNAMESPACE_H

Index: MatchBuilder.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/MatchBuilder.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- MatchBuilder.h	29 Dec 2005 19:29:50 -0000	1.37
+++ MatchBuilder.h	15 Mar 2006 21:34:01 -0000	1.38
@@ -50,7 +50,7 @@
 #include <mockpp/matcher/MatcherHolder.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Base for a helper class for convenient handling of match builders.
@@ -256,7 +256,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_MATCHBUILDER_H

Index: IdentityBuilder.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/IdentityBuilder.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- IdentityBuilder.cpp	29 Dec 2005 19:29:50 -0000	1.3
+++ IdentityBuilder.cpp	15 Mar 2006 21:34:01 -0000	1.4
@@ -38,7 +38,7 @@
 #include <mockpp/builder/IdentityBuilder.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 MOCKPP_EXPORT IdentityBuilder::~IdentityBuilder()
@@ -46,5 +46,5 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 

Index: StubBuilder.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/StubBuilder.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- StubBuilder.h	29 Dec 2005 19:29:50 -0000	1.25
+++ StubBuilder.h	15 Mar 2006 21:34:01 -0000	1.26
@@ -43,7 +43,7 @@
 #include <mockpp/stub/StubHolder.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Builder class for stub related purposes.
@@ -129,7 +129,7 @@
 #endif
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_STUBBUILDER_H

[Mockpp-commits] mockpp/mockpp/production TimeServer.cpp,1.8,1.9 TimeServer.h,1.3,1.4 mockpp_production.h,1.4,1.5

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/production
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/production

Modified Files:
	TimeServer.cpp TimeServer.h mockpp_production.h 
Log Message:
optionally disable mockpp namespace

Index: TimeServer.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TimeServer.h	29 Dec 2005 19:29:51 -0000	1.3
+++ TimeServer.h	15 Mar 2006 21:34:06 -0000	1.4
@@ -35,7 +35,7 @@
 #include <ctime>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Base class for time serving purposes
@@ -71,7 +71,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_TimeServer_H

Index: mockpp_production.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/production/mockpp_production.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mockpp_production.h	29 Dec 2005 19:29:51 -0000	1.4
+++ mockpp_production.h	15 Mar 2006 21:34:06 -0000	1.5
@@ -39,9 +39,9 @@
   * without the bloat of the testing environment.
   */
 
-namespace mockpp {
+MOCKPP_NS_START
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_PRODUCTION_H

Index: TimeServer.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- TimeServer.cpp	29 Dec 2005 19:29:51 -0000	1.8
+++ TimeServer.cpp	15 Mar 2006 21:34:06 -0000	1.9
@@ -32,7 +32,7 @@
 #include <mockpp/production/TimeServer.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 MOCKPP_EXPORT TimeServer::~TimeServer()
@@ -49,7 +49,7 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 

[Mockpp-commits] mockpp/mockpp/examples mock_greeter.cpp,1.22,1.23

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/examples

Modified Files:
	mock_greeter.cpp 
Log Message:
optionally disable mockpp namespace

Index: mock_greeter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/mock_greeter.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mock_greeter.cpp	29 Dec 2005 19:29:51 -0000	1.22
+++ mock_greeter.cpp	15 Mar 2006 21:34:04 -0000	1.23
@@ -75,8 +75,8 @@
   public:
     virtual ~StorageInterface() {}
     virtual void open() = 0;
-    virtual void write(const mockpp::String &msg) = 0;
-    virtual mockpp::String read() = 0;
+    virtual void write(const MOCKPP_NS::String &msg) = 0;
+    virtual MOCKPP_NS::String read() = 0;
     virtual void close() = 0;
 };
 
@@ -97,7 +97,7 @@
     };
 
 
-    HelloWriter(BugType bt, const mockpp::String who = MOCKPP_PCHAR("world") )
+    HelloWriter(BugType bt, const MOCKPP_NS::String who = MOCKPP_PCHAR("world") )
     {
       bugType = bt;
       who_is = who;
@@ -110,7 +110,7 @@
         storage.open();
       try
       {
-        mockpp::String greet = MOCKPP_PCHAR("hello, %1");
+        MOCKPP_NS::String greet = MOCKPP_PCHAR("hello, %1");
         greet << who_is;
         storage.write( greet );
       }
@@ -131,7 +131,7 @@
         storage.open();
       try
       {
-        mockpp::String s;
+        MOCKPP_NS::String s;
         s = storage.read();
       }
       catch(...)
@@ -146,18 +146,18 @@
 
 
   private:
-    mockpp::String  who_is;
+    MOCKPP_NS::String  who_is;
     BugType         bugType;
 };
 
 
-class StorageMockWriter : public mockpp::MockObject,
+class StorageMockWriter : public MOCKPP_NS::MockObject,
                           public StorageInterface
 {
   public:
 
     StorageMockWriter()
-      : mockpp::MockObject(MOCKPP_PCHAR("mockWriter")),
+      : MOCKPP_NS::MockObject(MOCKPP_PCHAR("mockWriter")),
         open_cnt (MOCKPP_PCHAR("storage open() counter"), this),
         write_cnt(MOCKPP_PCHAR("storage write() counter"), this),
         close_cnt(MOCKPP_PCHAR("storage close() counter"), this),
@@ -184,14 +184,14 @@
     }
 
 
-    mockpp::String read()
+    MOCKPP_NS::String read()
     {
       MOCKPP_NOT_IMPLEMENTED(MOCKPP_GET_STRING(MOCKPP_FUNC_MACRO));
       return MOCKPP_PCHAR("");
     }
 
 
-    void write(const mockpp::String &s)
+    void write(const MOCKPP_NS::String &s)
     {
       write_cnt.inc();
       greet_str.setActual(s);
@@ -207,22 +207,22 @@
 
   private:
 
-    mockpp::ExpectationCounter                open_cnt;
-    mockpp::ExpectationCounter                write_cnt;
-    mockpp::ExpectationCounter                close_cnt;
+    MOCKPP_NS::ExpectationCounter                open_cnt;
+    MOCKPP_NS::ExpectationCounter                write_cnt;
+    MOCKPP_NS::ExpectationCounter                close_cnt;
 
-    mockpp::ExpectationValue<mockpp::String>  greet_str;
-    mockpp::ExpectationValue<bool>            o_state;
+    MOCKPP_NS::ExpectationValue<MOCKPP_NS::String>  greet_str;
+    MOCKPP_NS::ExpectationValue<bool>            o_state;
 };
 
 
-class StorageMockReader : public mockpp::MockObject,
+class StorageMockReader : public MOCKPP_NS::MockObject,
                           public StorageInterface
 {
   public:
 
     StorageMockReader()
-      : mockpp::MockObject(MOCKPP_PCHAR("mockReader")),
+      : MOCKPP_NS::MockObject(MOCKPP_PCHAR("mockReader")),
         open_cnt (MOCKPP_PCHAR("storage open() counter"), this),
         read_cnt (MOCKPP_PCHAR("storage read() counter"), this),
         close_cnt(MOCKPP_PCHAR("storage close() counter"), this),
@@ -248,13 +248,13 @@
     }
 
 
-    void write(const mockpp::String &)
+    void write(const MOCKPP_NS::String &)
     {
       MOCKPP_NOT_IMPLEMENTED(MOCKPP_GET_STRING(MOCKPP_FUNC_MACRO));
     }
 
 
-    mockpp::String read()
+    MOCKPP_NS::String read()
     {
       read_cnt.inc();
       return ret_vals.nextReturnObject();
@@ -270,11 +270,11 @@
 
   private:
 
-    mockpp::ExpectationCounter                open_cnt;
-    mockpp::ExpectationCounter                read_cnt;
-    mockpp::ExpectationCounter                close_cnt;
-    mockpp::ReturnObjectList<mockpp::String>  ret_vals;
-    mockpp::ExpectationValue<bool>            o_state;
+    MOCKPP_NS::ExpectationCounter                open_cnt;
+    MOCKPP_NS::ExpectationCounter                read_cnt;
+    MOCKPP_NS::ExpectationCounter                close_cnt;
+    MOCKPP_NS::ReturnObjectList<MOCKPP_NS::String>  ret_vals;
+    MOCKPP_NS::ExpectationValue<bool>            o_state;
 };
 
 
@@ -361,7 +361,7 @@
     sm.verify();
   }
 #ifndef MOCKPP_NO_EXCEPTIONS
-  catch(mockpp::AssertionFailedError &)
+  catch(MOCKPP_NS::AssertionFailedError &)
   {
     thrown = true;
   }
@@ -381,7 +381,7 @@
     sm.verify();
   }
 #ifndef MOCKPP_NO_EXCEPTIONS
-  catch(mockpp::AssertionFailedError &)
+  catch(MOCKPP_NS::AssertionFailedError &)
   {
     thrown = true;
   }
@@ -401,7 +401,7 @@
     sm.verify();
   }
 #ifndef MOCKPP_NO_EXCEPTIONS
-  catch(mockpp::AssertionFailedError &)
+  catch(MOCKPP_NS::AssertionFailedError &)
   {
     thrown = true;
   }
@@ -421,7 +421,7 @@
     sm.verify();
   }
 #ifndef MOCKPP_NO_EXCEPTIONS
-  catch(mockpp::AssertionFailedError &)
+  catch(MOCKPP_NS::AssertionFailedError &)
   {
     thrown = true;
   }
@@ -442,7 +442,7 @@
     sm.verify();
   }
 #ifndef MOCKPP_NO_EXCEPTIONS
-  catch(mockpp::AssertionFailedError &)
+  catch(MOCKPP_NS::AssertionFailedError &)
   {
     thrown = true;
   }
@@ -462,7 +462,7 @@
   return CxxTest::GuiTuiRunner<CxxTest::Win32Gui, CxxTest::StdioPrinter>( argc, argv ).run();
 #else
    CxxTest::ErrorPrinter ep;
-   mockpp::CxxTestRunner::runAllTests(ep);
+   MOCKPP_NS::CxxTestRunner::runAllTests(ep);
    return CxxTest::tracker().failedTests();
    //return CxxTest::ErrorPrinter().run();
 #endif
@@ -495,13 +495,13 @@
   std::cout << "\n";
 
 #else
-  std::cout << mockpp::getLatin1(mockpp_i18n("Test framework was not available at compile time!\n")).c_str();
-  std::cout << mockpp::getLatin1(mockpp_i18n("Will use mockpp features only.\n\n")).c_str();
+  std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Test framework was not available at compile time!\n")).c_str();
+  std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Will use mockpp features only.\n\n")).c_str();
 #endif
 
   try
   {
-    std::cout << mockpp::getLatin1(mockpp_i18n("Now running some tests with just mockpp features:\n\n")).c_str();
+    std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Now running some tests with just mockpp features:\n\n")).c_str();
     Streamer_test st;
 
     st.test_write_ok();
@@ -512,7 +512,7 @@
     {
       st.fail_missing_close();
     }
-    catch (mockpp::AssertionFailedError & /*ae*/)
+    catch (MOCKPP_NS::AssertionFailedError & /*ae*/)
     {
       thrown = true;
     }
@@ -523,7 +523,7 @@
     {
       st.fail_missing_close_on_error();
     }
-    catch (mockpp::AssertionFailedError & /*ae*/)
+    catch (MOCKPP_NS::AssertionFailedError & /*ae*/)
     {
       thrown = true;
     }
@@ -531,14 +531,14 @@
 
     ret = 0;
   }
-  catch(mockpp::Exception &ex)
+  catch(MOCKPP_NS::Exception &ex)
   {
-    std::cout << "file: " << mockpp::getLatin1(ex.getSrcFile()).c_str() << std::endl
+    std::cout << "file: " << MOCKPP_NS::getLatin1(ex.getSrcFile()).c_str() << std::endl
               << "line: " << ex.getSrcLine() << std::endl
-              << "msg : " << mockpp::getLatin1(ex.getMessage()).c_str() << std::endl;
+              << "msg : " << MOCKPP_NS::getLatin1(ex.getMessage()).c_str() << std::endl;
     ret = 1;
   }
-  std::cout << mockpp::getLatin1(mockpp_i18n("Finished.\n")).c_str();
+  std::cout << MOCKPP_NS::getLatin1(mockpp_i18n("Finished.\n")).c_str();
   return ret;
 }
 

[Mockpp-commits] mockpp/mockpp/examples/tutorial basicmock.cpp,1.9,1.10 chainmock.cpp,1.14,1.15 chainmock2.cpp,1.4,1.5 cppunit.cpp,1.15,1.16 poormock-se.cpp,1.7,1.8 verifying.cpp,1.14,1.15 visitmock.cpp,1.17,1.18 visitmock2.cpp,1.4,1.5

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/examples/tutorial
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/examples/tutorial

Modified Files:
	basicmock.cpp chainmock.cpp chainmock2.cpp cppunit.cpp 
	poormock-se.cpp verifying.cpp visitmock.cpp visitmock2.cpp 
Log Message:
optionally disable mockpp namespace

Index: cppunit.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/cppunit.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cppunit.cpp	29 Dec 2005 19:29:51 -0000	1.15
+++ cppunit.cpp	15 Mar 2006 21:34:04 -0000	1.16
@@ -27,21 +27,21 @@
 
 #include "Calculator.h"
 
-using mockpp::eq;
-using mockpp::once;
-using mockpp::exactly;
-using mockpp::returnValue;
-using mockpp::throwException;
+using MOCKPP_NS::eq;
+using MOCKPP_NS::once;
+using MOCKPP_NS::exactly;
+using MOCKPP_NS::returnValue;
+using MOCKPP_NS::throwException;
 
 /** A Chainable mock object.
   * @internal
   */
-class ChainDemoMock : public mockpp::ChainableMockObject
+class ChainDemoMock : public MOCKPP_NS::ChainableMockObject
 {
   public:
 
     ChainDemoMock()
-      : mockpp::ChainableMockObject(MOCKPP_PCHAR("ChainDemoMock"), 0)
+      : MOCKPP_NS::ChainableMockObject(MOCKPP_PCHAR("ChainDemoMock"), 0)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE_EXT2(add, ext)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE0(network_read)
     {}
@@ -56,12 +56,12 @@
 /** A Visitable mock object.
   * @internal
   */
-class VisitDemoMock : public mockpp::VisitableMockObject
+class VisitDemoMock : public MOCKPP_NS::VisitableMockObject
 {
   public:
 
     VisitDemoMock()
-      : mockpp::VisitableMockObject(MOCKPP_PCHAR("VisitDemoMock"), 0)
+      : MOCKPP_NS::VisitableMockObject(MOCKPP_PCHAR("VisitDemoMock"), 0)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE_EXT2(add, ext)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE0(network_read)
     {}
@@ -238,7 +238,7 @@
 
     read_controller.setDefaultReturnValue(1);
     read_controller.addReturnValue(0, 10);
-    read_controller.addThrowable(mockpp::make_throwable(NetworkError()));
+    read_controller.addThrowable(MOCKPP_NS::make_throwable(NetworkError()));
 
     mock.activate();
 

Index: verifying.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/verifying.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- verifying.cpp	29 Dec 2005 19:29:51 -0000	1.14
+++ verifying.cpp	15 Mar 2006 21:34:04 -0000	1.15
@@ -31,15 +31,15 @@
 /** A helper class for the unit tests
   * @internal
   */
-class VerifyingCalculator_test : public mockpp::VerifyingTestCase
+class VerifyingCalculator_test : public MOCKPP_NS::VerifyingTestCase
 {
  public:
 
    CPPUNIT_TEST_SUITE( VerifyingCalculator_test );
      MOCKPP_TEST(test_ok_no_verify);
      MOCKPP_VERIFYING_TEST(test_ok);
-     MOCKPP_VERIFYING_TEST_EXCEPTION(test_fail, mockpp::AssertionFailedError);
-     MOCKPP_TEST_EXCEPTION(test_fail_no_verify, mockpp::AssertionFailedError);
+     MOCKPP_VERIFYING_TEST_EXCEPTION(test_fail, MOCKPP_NS::AssertionFailedError);
+     MOCKPP_TEST_EXCEPTION(test_fail_no_verify, MOCKPP_NS::AssertionFailedError);
    CPPUNIT_TEST_SUITE_END();
 
  public:
@@ -57,7 +57,7 @@
 
 void VerifyingCalculator_test::test_ok_no_verify()
 {
-  mockpp::ExpectationValue<int> ev (MOCKPP_PCHAR("ev"), this);
+  MOCKPP_NS::ExpectationValue<int> ev (MOCKPP_PCHAR("ev"), this);
   ev.setExpected(123);
   ev.setActual(123);
   verify();
@@ -66,23 +66,23 @@
 
 void VerifyingCalculator_test::test_ok()
 {
-  mockpp::ExpectationValue<int> *ev = new mockpp::ExpectationValue<int>(MOCKPP_PCHAR("ev"));
+  MOCKPP_NS::ExpectationValue<int> *ev = new MOCKPP_NS::ExpectationValue<int>(MOCKPP_PCHAR("ev"));
   registerVerifiable(ev);
   ev->setExpected(123);
   ev->setActual(123);
   ev->verify();
 
-  mockpp::ExpectationValue<int> ev2 (MOCKPP_PCHAR("ev2"), this);
+  MOCKPP_NS::ExpectationValue<int> ev2 (MOCKPP_PCHAR("ev2"), this);
   ev2.setExpected(123);
   ev2.setActual(123);
   ev2.verify();
 
-  mockpp::ExpectationValue<int> ev3 (MOCKPP_PCHAR("ev3"));
+  MOCKPP_NS::ExpectationValue<int> ev3 (MOCKPP_PCHAR("ev3"));
   ev3.setExpected(123);
   ev3.setActual(123);
   ev3.verify();
 
-  mockpp::ExpectationValue<int> *ev4 = new mockpp::ExpectationValue<int>(MOCKPP_PCHAR("ev"));
+  MOCKPP_NS::ExpectationValue<int> *ev4 = new MOCKPP_NS::ExpectationValue<int>(MOCKPP_PCHAR("ev"));
   registerVerifiable(ev4);
   ev4->setExpected(123);
   ev4->setActual(123);
@@ -94,7 +94,7 @@
 
 void VerifyingCalculator_test::test_fail_no_verify()
 {
-  mockpp::ExpectationValue<int> ev(MOCKPP_PCHAR("ev"), 0) ;
+  MOCKPP_NS::ExpectationValue<int> ev(MOCKPP_PCHAR("ev"), 0) ;
   ev.setExpected(123);
   ev.setActual(123456);
 }
@@ -102,7 +102,7 @@
 
 void VerifyingCalculator_test::test_fail()
 {
-  mockpp::ExpectationValue<int> *ev = new mockpp::ExpectationValue<int>(MOCKPP_PCHAR("ev"));
+  MOCKPP_NS::ExpectationValue<int> *ev = new MOCKPP_NS::ExpectationValue<int>(MOCKPP_PCHAR("ev"));
   registerVerifiable(ev);
   ev->setExpected(123);
   // missing actual

Index: visitmock2.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/visitmock2.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- visitmock2.cpp	29 Dec 2005 19:29:51 -0000	1.4
+++ visitmock2.cpp	15 Mar 2006 21:34:04 -0000	1.5
@@ -26,12 +26,12 @@
 
 
 class VisitMock : public Interface
-                , public mockpp::VisitableMockObject
+                , public MOCKPP_NS::VisitableMockObject
 {
   public:
 
     VisitMock()
-      : mockpp::VisitableMockObject(MOCKPP_PCHAR("VisitMock"), 0)
+      : MOCKPP_NS::VisitableMockObject(MOCKPP_PCHAR("VisitMock"), 0)
       , open_mocker(MOCKPP_PCHAR("open"), this)
       , read_mocker(MOCKPP_PCHAR("read"), this)
       , write_mocker(MOCKPP_PCHAR("write"), this)
@@ -59,12 +59,12 @@
       return calculate_mocker.forward(input);
     }
 
-    void write(const mockpp::ConstraintHolder<MOCKPP_STL::string> &ch)
+    void write(const MOCKPP_NS::ConstraintHolder<MOCKPP_STL::string> &ch)
     {
       write_mocker.forward(ch);
     }
 
-    void calculate(const mockpp::ConstraintHolder<unsigned> &ch)
+    void calculate(const MOCKPP_NS::ConstraintHolder<unsigned> &ch)
     {
       calculate_mocker.forward(ch);
     }
@@ -74,11 +74,11 @@
       close_mocker.forward();
     }
 
-    mockpp::VisitableMockMethod<void, MOCKPP_STL::string>   open_mocker;
-    mockpp::VisitableMockMethod<MOCKPP_STL::string>         read_mocker;
-    mockpp::VisitableMockMethod<void, MOCKPP_STL::string>   write_mocker;
-    mockpp::VisitableMockMethod<void>                close_mocker;
-    mockpp::VisitableMockMethod<unsigned, unsigned>  calculate_mocker;
+    MOCKPP_NS::VisitableMockMethod<void, MOCKPP_STL::string>   open_mocker;
+    MOCKPP_NS::VisitableMockMethod<MOCKPP_STL::string>         read_mocker;
+    MOCKPP_NS::VisitableMockMethod<void, MOCKPP_STL::string>   write_mocker;
+    MOCKPP_NS::VisitableMockMethod<void>                close_mocker;
+    MOCKPP_NS::VisitableMockMethod<unsigned, unsigned>  calculate_mocker;
 };
 
 
@@ -87,8 +87,8 @@
   try
   {
     VisitMock mock;
-    mockpp::VisitableMockMethod<MOCKPP_STL::string> &read_controller (mock.read_mocker);
-    mockpp::VisitableMockMethod<unsigned, unsigned> &calculate_controller (mock.calculate_mocker);
+    MOCKPP_NS::VisitableMockMethod<MOCKPP_STL::string> &read_controller (mock.read_mocker);
+    MOCKPP_NS::VisitableMockMethod<unsigned, unsigned> &calculate_controller (mock.calculate_mocker);
 
     // record program flow while reading data
     mock.open("file1.lst");
@@ -104,12 +104,12 @@
 
     // processing is not exactly defined
 #if defined(_MSC_VER) && _MSC_VER <= 1300
-    mock.calculate(new mockpp::IsCloseTo<unsigned>(5, 5));
-    mock.calculate(new mockpp::IsCloseTo<unsigned>(5, 5));
-    mock.calculate(new mockpp::IsCloseTo<unsigned>(5, 5));
-    calculate_controller.addResponseValue(10, new mockpp::IsCloseTo<unsigned>(2, 2));
-    calculate_controller.addResponseValue(20, new mockpp::IsCloseTo<unsigned>(4, 2));
-    calculate_controller.addResponseValue(30, new mockpp::IsCloseTo<unsigned>(6, 2));
+    mock.calculate(new MOCKPP_NS::IsCloseTo<unsigned>(5, 5));
+    mock.calculate(new MOCKPP_NS::IsCloseTo<unsigned>(5, 5));
+    mock.calculate(new MOCKPP_NS::IsCloseTo<unsigned>(5, 5));
+    calculate_controller.addResponseValue(10, new MOCKPP_NS::IsCloseTo<unsigned>(2, 2));
+    calculate_controller.addResponseValue(20, new MOCKPP_NS::IsCloseTo<unsigned>(4, 2));
+    calculate_controller.addResponseValue(30, new MOCKPP_NS::IsCloseTo<unsigned>(6, 2));
 #else
     mock.calculate(eq<unsigned>(5, 5));
     mock.calculate(eq<unsigned>(5, 5));

Index: poormock-se.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/poormock-se.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- poormock-se.cpp	29 Dec 2005 19:29:51 -0000	1.7
+++ poormock-se.cpp	15 Mar 2006 21:34:04 -0000	1.8
@@ -22,16 +22,16 @@
 
 
 class PoorMockSecondEdition : public Interface
-                            , public mockpp::MockObject
+                            , public MOCKPP_NS::MockObject
 {
   private:
 
-    mockpp::TrackingCounterMaster counter;
+    MOCKPP_NS::TrackingCounterMaster counter;
 
   public:
 
     PoorMockSecondEdition()
-      : mockpp::MockObject(MOCKPP_PCHAR("MockObject"))
+      : MOCKPP_NS::MockObject(MOCKPP_PCHAR("MockObject"))
       , counter(MOCKPP_PCHAR("counter"), this)
       , open_counter(MOCKPP_PCHAR("open_counter"), counter)
       , read_counter(MOCKPP_PCHAR("read_counter"), counter)
@@ -66,10 +66,10 @@
       close_counter++;
     }
 
-    mockpp::TrackingCounterClient open_counter;
-    mockpp::TrackingCounterClient read_counter;
-    mockpp::TrackingCounterClient write_counter;
-    mockpp::TrackingCounterClient close_counter;
+    MOCKPP_NS::TrackingCounterClient open_counter;
+    MOCKPP_NS::TrackingCounterClient read_counter;
+    MOCKPP_NS::TrackingCounterClient write_counter;
+    MOCKPP_NS::TrackingCounterClient close_counter;
 };
 
 

Index: visitmock.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/visitmock.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- visitmock.cpp	29 Dec 2005 19:29:51 -0000	1.17
+++ visitmock.cpp	15 Mar 2006 21:34:04 -0000	1.18
@@ -25,12 +25,12 @@
 
 
 class VisitMock : public Interface
-                , public mockpp::VisitableMockObject
+                , public MOCKPP_NS::VisitableMockObject
 {
   public:
 
     VisitMock()
-      : mockpp::VisitableMockObject(MOCKPP_PCHAR("VisitMock"), 0)
+      : MOCKPP_NS::VisitableMockObject(MOCKPP_PCHAR("VisitMock"), 0)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT1(open, ext)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE0(read)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT1(write, ext)
@@ -75,12 +75,12 @@
 
     // processing is not exactly defined
 #if defined(_MSC_VER) && _MSC_VER <= 1300
-    mock.calculate(new mockpp::IsCloseTo<unsigned>(5, 5));
-    mock.calculate(new mockpp::IsCloseTo<unsigned>(5, 5));
-    mock.calculate(new mockpp::IsCloseTo<unsigned>(5, 5));
-    calculate_controller.addResponseValue(10, new mockpp::IsCloseTo<unsigned>(2, 2));
-    calculate_controller.addResponseValue(20, new mockpp::IsCloseTo<unsigned>(4, 2));
-    calculate_controller.addResponseValue(30, new mockpp::IsCloseTo<unsigned>(6, 2));
+    mock.calculate(new MOCKPP_NS::IsCloseTo<unsigned>(5, 5));
+    mock.calculate(new MOCKPP_NS::IsCloseTo<unsigned>(5, 5));
+    mock.calculate(new MOCKPP_NS::IsCloseTo<unsigned>(5, 5));
+    calculate_controller.addResponseValue(10, new MOCKPP_NS::IsCloseTo<unsigned>(2, 2));
+    calculate_controller.addResponseValue(20, new MOCKPP_NS::IsCloseTo<unsigned>(4, 2));
+    calculate_controller.addResponseValue(30, new MOCKPP_NS::IsCloseTo<unsigned>(6, 2));
 #else
     mock.calculate(eq<unsigned>(5, 5));
     mock.calculate(eq<unsigned>(5, 5));

Index: chainmock2.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/chainmock2.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- chainmock2.cpp	29 Dec 2005 19:29:51 -0000	1.4
+++ chainmock2.cpp	15 Mar 2006 21:34:04 -0000	1.5
@@ -23,15 +23,15 @@
 #include <exception>
 #include <iostream>
 
-using namespace mockpp;
+USING_NAMESPACE_MOCKPP
 
 class ChainMock : public Interface
-                , public mockpp::ChainableMockObject
+                , public MOCKPP_NS::ChainableMockObject
 {
   public:
 
     ChainMock()
-      : mockpp::ChainableMockObject(MOCKPP_PCHAR("ChainMock"), 0)
+      : MOCKPP_NS::ChainableMockObject(MOCKPP_PCHAR("ChainMock"), 0)
       , open_mocker(MOCKPP_PCHAR("open"), this)
       , read_mocker(MOCKPP_PCHAR("read"), this)
       , write_mocker(MOCKPP_PCHAR("write"), this)
@@ -64,11 +64,11 @@
       close_mocker.forward();
     }
 
-    mockpp::ChainableMockMethod<void, MOCKPP_STL::string>   open_mocker;
-    mockpp::ChainableMockMethod<MOCKPP_STL::string>         read_mocker;
-    mockpp::ChainableMockMethod<void, MOCKPP_STL::string>   write_mocker;
-    mockpp::ChainableMockMethod<void>                close_mocker;
-    mockpp::ChainableMockMethod<unsigned, unsigned>  calculate_mocker;
+    MOCKPP_NS::ChainableMockMethod<void, MOCKPP_STL::string>   open_mocker;
+    MOCKPP_NS::ChainableMockMethod<MOCKPP_STL::string>         read_mocker;
+    MOCKPP_NS::ChainableMockMethod<void, MOCKPP_STL::string>   write_mocker;
+    MOCKPP_NS::ChainableMockMethod<void>                close_mocker;
+    MOCKPP_NS::ChainableMockMethod<unsigned, unsigned>  calculate_mocker;
 };
 
 
@@ -78,11 +78,11 @@
   {
     ChainMock mock;
 
-    mockpp::ChainableMockMethod<void, MOCKPP_STL::string>  &open_chainer  (mock.open_mocker);
-    mockpp::ChainableMockMethod<MOCKPP_STL::string>        &read_chainer  (mock.read_mocker);
-    mockpp::ChainableMockMethod<void, MOCKPP_STL::string>  &write_chainer (mock.write_mocker);
-    mockpp::ChainableMockMethod<void>               &close_chainer (mock.close_mocker);
-    mockpp::ChainableMockMethod<unsigned, unsigned> &calculate_chainer (mock.calculate_mocker);
+    MOCKPP_NS::ChainableMockMethod<void, MOCKPP_STL::string>  &open_chainer  (mock.open_mocker);
+    MOCKPP_NS::ChainableMockMethod<MOCKPP_STL::string>        &read_chainer  (mock.read_mocker);
+    MOCKPP_NS::ChainableMockMethod<void, MOCKPP_STL::string>  &write_chainer (mock.write_mocker);
+    MOCKPP_NS::ChainableMockMethod<void>               &close_chainer (mock.close_mocker);
+    MOCKPP_NS::ChainableMockMethod<unsigned, unsigned> &calculate_chainer (mock.calculate_mocker);
 
     // Expectations for reading the file
     open_chainer.expects(once())

Index: basicmock.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/basicmock.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- basicmock.cpp	29 Dec 2005 19:29:51 -0000	1.9
+++ basicmock.cpp	15 Mar 2006 21:34:04 -0000	1.10
@@ -27,16 +27,16 @@
 #include <exception>
 #include <iostream>
 
-using namespace mockpp;
+USING_NAMESPACE_MOCKPP
 
 
 class BasicMock : public Interface
-                , public mockpp::MockObject
+                , public MOCKPP_NS::MockObject
 {
   public:
 
     BasicMock()
-      : mockpp::MockObject(MOCKPP_PCHAR("BasicMock"), 0)
+      : MOCKPP_NS::MockObject(MOCKPP_PCHAR("BasicMock"), 0)
       , open_name(MOCKPP_PCHAR("BasicMock/open_name"), this)
       , close_counter(MOCKPP_PCHAR("BasicMock/close_counter"), this)
       , write_data(MOCKPP_PCHAR("BasicMock/write_data"), this)
@@ -72,12 +72,12 @@
       close_counter.inc();
     }
 
-    mockpp::ExpectationList<MOCKPP_STL::string>  open_name;
-    mockpp::ExpectationCounter            close_counter;
-    mockpp::ExpectationList<MOCKPP_STL::string>  write_data;
-    mockpp::ReturnObjectList<MOCKPP_STL::string> read_data;
-    mockpp::ReturnObjectList<unsigned>    calculate_output;
-    mockpp::ConstraintList<unsigned >     calculate_input;
+    MOCKPP_NS::ExpectationList<MOCKPP_STL::string>  open_name;
+    MOCKPP_NS::ExpectationCounter            close_counter;
+    MOCKPP_NS::ExpectationList<MOCKPP_STL::string>  write_data;
+    MOCKPP_NS::ReturnObjectList<MOCKPP_STL::string> read_data;
+    MOCKPP_NS::ReturnObjectList<unsigned>    calculate_output;
+    MOCKPP_NS::ConstraintList<unsigned >     calculate_input;
 };
 
 

Index: chainmock.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/chainmock.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- chainmock.cpp	29 Dec 2005 19:29:51 -0000	1.14
+++ chainmock.cpp	15 Mar 2006 21:34:04 -0000	1.15
@@ -22,25 +22,25 @@
 #include <exception>
 #include <iostream>
 
-using namespace mockpp;
+USING_NAMESPACE_MOCKPP
 
 
-typedef mockpp::Invocation1<MOCKPP_STL::string> InvocationString;
-typedef mockpp::Invocation1<unsigned> InvocationUInt;
+typedef MOCKPP_NS::Invocation1<MOCKPP_STL::string> InvocationString;
+typedef MOCKPP_NS::Invocation1<unsigned> InvocationUInt;
 
 /*
-MOCKPP_PTI_IMPLEMENT(mockpp::Invocation0);
+MOCKPP_PTI_IMPLEMENT(MOCKPP_NS::Invocation0);
 MOCKPP_PTI_IMPLEMENT(InvocationString);
 MOCKPP_PTI_IMPLEMENT(InvocationUInt);
 */
 
 class ChainMock : public Interface
-                , public mockpp::ChainableMockObject
+                , public MOCKPP_NS::ChainableMockObject
 {
   public:
 
     ChainMock()
-      : mockpp::ChainableMockObject(MOCKPP_PCHAR("ChainMock"), 0)
+      : MOCKPP_NS::ChainableMockObject(MOCKPP_PCHAR("ChainMock"), 0)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT1(open, ext)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE0(read)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT1(write, ext)

[Mockpp-commits] mockpp/mockpp/framework CxxTestRunner.h,1.5,1.6 VerifyingTestCaller.cpp,1.3,1.4 VerifyingTestCaller.h,1.5,1.6 VerifyingTestCase.cpp,1.4,1.5 VerifyingTestCase.h,1.5,1.6

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/framework
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/framework

Modified Files:
	CxxTestRunner.h VerifyingTestCaller.cpp VerifyingTestCaller.h 
	VerifyingTestCase.cpp VerifyingTestCase.h 
Log Message:
optionally disable mockpp namespace

Index: VerifyingTestCase.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- VerifyingTestCase.cpp	29 Dec 2005 19:29:51 -0000	1.4
+++ VerifyingTestCase.cpp	15 Mar 2006 21:34:05 -0000	1.5
@@ -46,7 +46,7 @@
 #include <cppunit/TestResult.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 MOCKPP_EXPORT VerifyingTestCase::VerifyingTestCase()
@@ -110,7 +110,7 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_USE_CPPUNIT

Index: VerifyingTestCaller.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- VerifyingTestCaller.cpp	29 Dec 2005 19:29:51 -0000	1.3
+++ VerifyingTestCaller.cpp	15 Mar 2006 21:34:05 -0000	1.4
@@ -32,10 +32,10 @@
 #include <mockpp/framework/VerifyingTestCaller.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 // is a template
 
 
-} // namespace mockpp
+MOCKPP_NS_END

Index: VerifyingTestCaller.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCaller.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- VerifyingTestCaller.h	3 Jan 2006 15:12:34 -0000	1.5
+++ VerifyingTestCaller.h	15 Mar 2006 21:34:05 -0000	1.6
@@ -41,7 +41,7 @@
 #include <cppunit/TestCaller.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** VerifyingTestCaller that verifies Verifiable
@@ -128,7 +128,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 /** Add a method to the suite and verify after its run.
@@ -141,7 +141,7 @@
   */
 #define MOCKPP_VERIFYING_TEST( testMethod ) \
     CPPUNIT_TEST_SUITE_ADD_TEST(  \
-        ( new mockpp::VerifyingTestCaller<TestFixtureType, true>( \
+        ( new MOCKPP_NS::VerifyingTestCaller<TestFixtureType, true>( \
                   context.getTestNameFor( #testMethod),   \
                   &TestFixtureType::testMethod,           \
                   context.makeFixture() ) ) )
@@ -156,7 +156,7 @@
   */
 #define MOCKPP_TEST( testMethod ) \
     CPPUNIT_TEST_SUITE_ADD_TEST(  \
-        ( new mockpp::VerifyingTestCaller<TestFixtureType, false>( \
+        ( new MOCKPP_NS::VerifyingTestCaller<TestFixtureType, false>( \
                   context.getTestNameFor( #testMethod),   \
                   &TestFixtureType::testMethod,           \
                   context.makeFixture() ) ) )
@@ -175,7 +175,7 @@
 #define MOCKPP_VERIFYING_TEST_EXCEPTION( testMethod, ExceptionType )  \
   CPPUNIT_TEST_SUITE_ADD_TEST(                                        \
       (new ::CppUnit::ExceptionTestCaseDecorator< ExceptionType >(      \
-          new mockpp::VerifyingTestCaller< TestFixtureType, true >(   \
+          new MOCKPP_NS::VerifyingTestCaller< TestFixtureType, true >(   \
                                context.getTestNameFor( #testMethod ), \
                                &TestFixtureType::testMethod,          \
                                context.makeFixture() ) ) ) )
@@ -192,7 +192,7 @@
 #define MOCKPP_TEST_EXCEPTION( testMethod, ExceptionType )  \
   CPPUNIT_TEST_SUITE_ADD_TEST(                                        \
       (new ::CppUnit::ExceptionTestCaseDecorator< ExceptionType >(      \
-          new mockpp::VerifyingTestCaller< TestFixtureType, false >(  \
+          new MOCKPP_NS::VerifyingTestCaller< TestFixtureType, false >(  \
                                context.getTestNameFor( #testMethod ), \
                                &TestFixtureType::testMethod,          \
                                context.makeFixture() ) ) ) )

Index: VerifyingTestCase.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/VerifyingTestCase.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- VerifyingTestCase.h	3 Jan 2006 15:12:34 -0000	1.5
+++ VerifyingTestCase.h	15 Mar 2006 21:34:05 -0000	1.6
@@ -45,7 +45,7 @@
 #include <cppunit/TestCaller.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** TestCase that verifies Verifiable
@@ -101,7 +101,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_VerifyingTestCaller_H

Index: CxxTestRunner.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/CxxTestRunner.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CxxTestRunner.h	3 Jan 2006 15:12:34 -0000	1.5
+++ CxxTestRunner.h	15 Mar 2006 21:34:05 -0000	1.6
@@ -39,7 +39,7 @@
 #include <cxxtest/TestRunner.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Helper class to run tests with CxxTest framework.
@@ -58,8 +58,8 @@
 
         _TS_TRY { CxxTestRunner().runWorld(); }
 
-        _TS_CATCH_TYPE( (mockpp::Exception &ex),
-                        {CxxTest::tracker().failedTest( mockpp::getLatin1(ex.getSrcFile()).c_str(), ex.getSrcLine(), mockpp::getLatin1(ex.getMessage()).c_str() ); } )
+        _TS_CATCH_TYPE( (MOCKPP_NS::Exception &ex),
+                        {CxxTest::tracker().failedTest( MOCKPP_NS::getLatin1(ex.getSrcFile()).c_str(), ex.getSrcLine(), MOCKPP_NS::getLatin1(ex.getMessage()).c_str() ); } )
 
         _TS_CATCH_TYPE( (std::exception &ex),
                         {CxxTest::tracker().failedTest( __FILE__, __LINE__, ex.what() ); } )
@@ -71,7 +71,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_USE_CXXTEST

[Mockpp-commits] mockpp/mockpp/docs/artikel/listings basicmock.cpp,1.2,1.3 chainmock.cpp,1.3,1.4 visitmock.cpp,1.3,1.4

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/docs/artikel/listings

Modified Files:
	basicmock.cpp chainmock.cpp visitmock.cpp 
Log Message:
optionally disable mockpp namespace

Index: basicmock.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/basicmock.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- basicmock.cpp	29 Dec 2004 11:18:59 -0000	1.2
+++ basicmock.cpp	15 Mar 2006 21:34:03 -0000	1.3
@@ -15,12 +15,12 @@
 
 
 class BasicMock : public Interface
-                , public mockpp::MockObject
+                , public MOCKPP_NS::MockObject
 {
   public:
 
     BasicMock()
-      : mockpp::MockObject(MOCKPP_PCHAR("BasicMock"), 0)
+      : MOCKPP_NS::MockObject(MOCKPP_PCHAR("BasicMock"), 0)
       , open_name(MOCKPP_PCHAR("BasicMock/open_name"), this)
       , close_counter(MOCKPP_PCHAR("BasicMock/close_counter"), this)
       , write_data(MOCKPP_PCHAR("BasicMock/write_data"), this)
@@ -48,10 +48,10 @@
       close_counter.inc();
     }
 
-    mockpp::ExpectationList<std::string>  open_name;
-    mockpp::ExpectationCounter            close_counter;
-    mockpp::ExpectationList<std::string>  write_data;
-    mockpp::ReturnObjectList<std::string> read_data;
+    MOCKPP_NS::ExpectationList<std::string>  open_name;
+    MOCKPP_NS::ExpectationCounter            close_counter;
+    MOCKPP_NS::ExpectationList<std::string>  write_data;
+    MOCKPP_NS::ReturnObjectList<std::string> read_data;
 };
 
 
@@ -61,19 +61,19 @@
   {
     BasicMock mock;
 
-    // Jeweils öffnen beim Lesen und Schreiben
+    // Jeweils �ffnen beim Lesen und Schreiben
     mock.open_name.addExpected("datei1.lst");
     mock.open_name.addExpected("datei1.lst");
 
     // Jeweils schliessen beim Lesen und Schreiben
     mock.close_counter.setExpected(2);
 
-    // Die Datei enthält genau 3 Zeilen Daten
+    // Die Datei enth�lt genau 3 Zeilen Daten
     mock.read_data.addObjectToReturn("Datenpaket-1");
     mock.read_data.addObjectToReturn("Datenpaket-2");
     mock.read_data.addObjectToReturn("Datenpaket-3");
 
-    // Es werden wieder genau 3 Zeilen Daten zurückgeschrieben
+    // Es werden wieder genau 3 Zeilen Daten zur�ckgeschrieben
     mock.write_data.addExpected("Datenpaket-1/fertig");
     mock.write_data.addExpected("Datenpaket-2/fertig");
     mock.write_data.addExpected("Datenpaket-3/fertig");
@@ -88,7 +88,7 @@
 
     std::cout << "Ende der Tests" << std::endl;
 
-    // alle restlichen Bedingungen prüfen
+    // alle restlichen Bedingungen pr�fen
     mock.verify();
     std::cout << "Alle Tests wurden fehlerfrei durchlaufen" << std::endl;
   }

Index: chainmock.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/chainmock.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- chainmock.cpp	29 Dec 2004 22:51:04 -0000	1.3
+++ chainmock.cpp	15 Mar 2006 21:34:03 -0000	1.4
@@ -12,16 +12,16 @@
 #include <exception>
 #include <iostream>
 
-using namespace mockpp;
+USING_NAMESPACE_MOCKPP
 
 
 class ChainMock : public Interface
-                , public mockpp::ChainableMockObject
+                , public MOCKPP_NS::ChainableMockObject
 {
   public:
 
     ChainMock()
-      : mockpp::ChainableMockObject(MOCKPP_PCHAR("ChainMock"), 0)
+      : MOCKPP_NS::ChainableMockObject(MOCKPP_PCHAR("ChainMock"), 0)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT1(open, ext)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_CHAINABLE0(read)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_CHAINABLE_EXT1(write, ext)
@@ -50,7 +50,7 @@
     MOCKPP_CHAINER_FOR_EXT(ChainMock, write, ext) write_chainer (&mock);
     MOCKPP_CHAINER_FOR(ChainMock, close) close_chainer (&mock);
 
-    // Erwartungen für das Einlesen der Datei
+    // Erwartungen f�r das Einlesen der Datei
     open_chainer.expects(once())
                 .with(eq(std::string("datei1.lst")))
                 .before(MOCKPP_PCHAR("reader"));
@@ -65,7 +65,7 @@
                  .after(MOCKPP_PCHAR("reader"));
 
 
-    // Erwartungen für das Zurückschreiben der Datei
+    // Erwartungen f�r das Zur�ckschreiben der Datei
     open_chainer.expects(once())
                 .with(eq(std::string("datei1.lst")))
                 .before(MOCKPP_PCHAR("writer"));
@@ -92,7 +92,7 @@
 
     std::cout << "Ende der Tests" << std::endl;
 
-    // alle restlichen Bedingungen prüfen
+    // alle restlichen Bedingungen pr�fen
     mock.verify();
     std::cout << "Alle Tests wurden fehlerfrei durchlaufen" << std::endl;
   }

Index: visitmock.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/artikel/listings/visitmock.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- visitmock.cpp	29 Dec 2004 22:51:04 -0000	1.3
+++ visitmock.cpp	15 Mar 2006 21:34:03 -0000	1.4
@@ -12,12 +12,12 @@
 
 
 class VisitMock : public Interface
-                , public mockpp::VisitableMockObject
+                , public MOCKPP_NS::VisitableMockObject
 {
   public:
 
     VisitMock()
-      : mockpp::VisitableMockObject(MOCKPP_PCHAR("VisitMock"), 0)
+      : MOCKPP_NS::VisitableMockObject(MOCKPP_PCHAR("VisitMock"), 0)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT1(open, ext)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_VISITABLE0(read)
       , MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT1(write, ext)
@@ -50,12 +50,12 @@
     mock.read();
     mock.close();
 
-    // Rückgabewerte für read() eintragen
+    // R�ckgabewerte f�r read() eintragen
     read_controller.addReturnValue("Datenpaket-1");
     read_controller.addReturnValue("Datenpaket-2");
     read_controller.addReturnValue("Datenpaket-3");
 
-    // Ablauf beim Zurückschreiben "aufzeichnen"
+    // Ablauf beim Zur�ckschreiben "aufzeichnen"
     mock.open("datei1.lst");
     mock.write("Datenpaket-1/fertig");
     mock.write("Datenpaket-2/fertig");
@@ -75,7 +75,7 @@
 
     std::cout << "Ende der Tests" << std::endl;
 
-    // alle restlichen Bedingungen prüfen
+    // alle restlichen Bedingungen pr�fen
     mock.verify();
 
     std::cout << "Alle Tests wurden fehlerfrei durchlaufen" << std::endl;

[Mockpp-commits] mockpp/mockpp/compat Asserter.cpp,1.2,1.3 Asserter.h,1.2,1.3 AssertionFailedError.cpp,1.18,1.19 AssertionFailedError.h,1.14,1.15 Exception.cpp,1.14,1.15 Exception.h,1.19,1.20 Formatter.cpp,1.49,1.50 Formatter.h,1.39,1.40

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/compat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/compat

Modified Files:
	Asserter.cpp Asserter.h AssertionFailedError.cpp 
	AssertionFailedError.h Exception.cpp Exception.h Formatter.cpp 
	Formatter.h 
Log Message:
optionally disable mockpp namespace

Index: Formatter.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Formatter.h	6 Mar 2006 19:21:34 -0000	1.39
+++ Formatter.h	15 Mar 2006 21:34:02 -0000	1.40
@@ -33,7 +33,7 @@
 #include <mockpp/mockpp.h>  // always first header
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Converts a long value into its string representation.
@@ -42,7 +42,7 @@
   * @param base       the conversion base from 2 to 36
   * @return the resulting string
   */
-  mockpp::String number(long n, unsigned base = 10);
+  MOCKPP_NS::String number(long n, unsigned base = 10);
 
 /** Converts a longlong value into its string representation.
   * @ingroup grp_helper
@@ -50,7 +50,7 @@
   * @param base       the conversion base from 2 to 36
   * @return the resulting string
   */
-  mockpp::String number(long long n, unsigned base = 10);
+  MOCKPP_NS::String number(long long n, unsigned base = 10);
 
 
 /** Converts an unsigned long value into its string representation.
@@ -59,7 +59,7 @@
   * @param base       the conversion base from 2 to 36
   * @return the resulting string
   */
-  mockpp::String number(unsigned long n, unsigned base = 10);
+  MOCKPP_NS::String number(unsigned long n, unsigned base = 10);
 
 
 /** Converts an unsigned long value into its string representation.
@@ -68,7 +68,7 @@
   * @param base       the conversion base from 2 to 36
   * @return the resulting string
   */
-  mockpp::String number(unsigned long long n, unsigned base = 10);
+  MOCKPP_NS::String number(unsigned long long n, unsigned base = 10);
 
 
 /** Converts an double value into its string representation.
@@ -78,7 +78,7 @@
   *                   0 = minimum required, no trailing zeros.
   * @return the resulting string
   */
-  mockpp::String number(double n, unsigned prec = 0);
+  MOCKPP_NS::String number(double n, unsigned prec = 0);
 
 
 /** Replace a positional %-parameter with a value.
@@ -92,7 +92,7 @@
   String & MOCKPP_EXPORT replaceFormatterString(String &formatter, const String &repdata);
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 /** Replace a positional %-parameter with a value.
@@ -103,7 +103,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const int &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const int &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -114,7 +114,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const bool &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const bool &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -125,7 +125,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const unsigned int &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const unsigned int &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -136,7 +136,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const unsigned long &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const unsigned long &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -147,7 +147,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const signed char &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const signed char &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -158,7 +158,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const unsigned char &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const unsigned char &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -169,7 +169,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const char &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const char &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -180,7 +180,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const char * repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const char * repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -191,7 +191,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const float &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const float &repdata);
 
 #ifdef MOCKPP_UNICODE
 
@@ -203,7 +203,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const wchar_t &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const wchar_t &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -214,7 +214,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const wchar_t * repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const wchar_t * repdata);
 
 #endif // MOCKPP_UNICODE
 
@@ -227,7 +227,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const long &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const long &repdata);
 
 
 /** Replace a positional %-parameter with a value.
@@ -238,7 +238,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const mockpp::String &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const MOCKPP_NS::String &repdata);
 
 
 #ifdef MOCKPP_UNICODE
@@ -251,7 +251,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const MOCKPP_STL::string &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const MOCKPP_STL::string &repdata);
 
 #else // MOCKPP_UNICODE
 
@@ -263,7 +263,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-// mockpp::String & operator << (mockpp::String &formatter, const MOCKPP_STL::basic_string<wchar_t> &repdata);
+// MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const MOCKPP_STL::basic_string<wchar_t> &repdata);
 
 #endif // MOCKPP_UNICODE
 
@@ -276,7 +276,7 @@
   * @param repdata    value to replace
   * @return the resulting string
   */
-mockpp::String & operator << (mockpp::String &formatter, const double &repdata);
+MOCKPP_NS::String & operator << (MOCKPP_NS::String &formatter, const double &repdata);
 
 
 #ifdef MOCKPP_ENABLE_DEFAULT_FORMATTER
@@ -291,9 +291,9 @@
   * @return the resulting string
   */
 template <typename T>
-mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T &o)
+MOCKPP_NS::String & MOCKPP_EXPORT operator << (MOCKPP_NS::String &formatter, const T &o)
 {
-  mockpp::String s =   MOCKPP_PCHAR("[")
+  MOCKPP_NS::String s =   MOCKPP_PCHAR("[")
 #ifdef MOCKPP_NO_RTTI
                      + MOCKPP_GET_STRING("[rtti-disabled]")
 #else
@@ -315,9 +315,9 @@
   * @return the resulting string
   */
 template <typename T>
-mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T * &po)
+MOCKPP_NS::String & MOCKPP_EXPORT operator << (MOCKPP_NS::String &formatter, const T * &po)
 {
-  mockpp::String s =   MOCKPP_PCHAR("[")
+  MOCKPP_NS::String s =   MOCKPP_PCHAR("[")
 #ifdef MOCKPP_NO_RTTI
                      + MOCKPP_GET_STRING("[rtti-disabled]")
 #else
@@ -337,15 +337,15 @@
 #include <sstream>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 template <class T>
-mockpp::String ostreamed(const T& t)
+MOCKPP_NS::String ostreamed(const T& t)
 {
   std::basic_ostringstream<char> oss;
   oss << t;
 #ifdef MOCKPP_UNICODE
-  return mockpp::getUnicode(oss.str());
+  return MOCKPP_NS::getUnicode(oss.str());
 #else
 #ifdef MOCKPP_ALTERNATIVE_STL
   return oss.str().c_str();
@@ -355,25 +355,25 @@
 #endif
 }
 
-}
+MOCKPP_NS_END
 
 /** Outputter which reuses an existing operator<<(std::basic_ostream<char>&, T).
   * @param  T  data type for output
   */
 #define MOCKPP_OSTREAMABLE(T) \
-mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T &o) \
+MOCKPP_NS::String & MOCKPP_EXPORT operator << (MOCKPP_NS::String &formatter, const T &o) \
 { \
-  formatter << mockpp::ostreamed(o); \
+  formatter << MOCKPP_NS::ostreamed(o); \
   return formatter; \
 }
 
 
 #ifdef MOCKPP_UNICODE
 
-namespace mockpp {
+MOCKPP_NS_START
 
 template <class T>
-mockpp::String owstreamed(const T& t)
+MOCKPP_NS::String owstreamed(const T& t)
 {
   std::basic_ostringstream<wchar_t> oss;
   oss << t;
@@ -384,15 +384,15 @@
 #endif
 }
 
-}
+MOCKPP_NS_END
 
 /** Outputter which reuses an existing operator<<(std::basic_ostream<wchar_t>&, T).
   * @param  T  data type for output
   */
 #define MOCKPP_OWSTREAMABLE(T) \
-mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const T &o) \
+MOCKPP_NS::String & MOCKPP_EXPORT operator << (MOCKPP_NS::String &formatter, const T &o) \
 { \
-  formatter <<  mockpp::owstreamed(o); \
+  formatter <<  MOCKPP_NS::owstreamed(o); \
   return formatter; \
 }
 

Index: Exception.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Exception.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Exception.h	29 Dec 2005 19:29:50 -0000	1.19
+++ Exception.h	15 Mar 2006 21:34:02 -0000	1.20
@@ -36,7 +36,7 @@
 #endif
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Base class for all mockpp exceptions. The main purpose of such exceptions
@@ -97,7 +97,7 @@
 };
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ASSERTIONFAILED_H

Index: AssertionFailedError.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/AssertionFailedError.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- AssertionFailedError.h	29 Dec 2005 19:29:50 -0000	1.14
+++ AssertionFailedError.h	15 Mar 2006 21:34:02 -0000	1.15
@@ -35,7 +35,7 @@
 #include <mockpp/compat/Exception.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /**
@@ -77,7 +77,7 @@
                      const String &message);
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 #endif // MOCKPP_ASSERTIONFAILED_H

Index: Asserter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Asserter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Asserter.cpp	29 Dec 2005 19:29:50 -0000	1.2
+++ Asserter.cpp	15 Mar 2006 21:34:02 -0000	1.3
@@ -66,7 +66,7 @@
 #include <mockpp/compat/Asserter.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 void MOCKPP_EXPORT assertTrue(unsigned srcline, const char* srcfile,
@@ -219,4 +219,4 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END

Index: Exception.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Exception.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Exception.cpp	29 Dec 2005 19:29:50 -0000	1.14
+++ Exception.cpp	15 Mar 2006 21:34:02 -0000	1.15
@@ -32,7 +32,7 @@
 #include <mockpp/compat/Exception.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 MOCKPP_EXPORT  Exception::Exception(unsigned line, const char *file, const String &msg)
@@ -85,6 +85,6 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 

Index: Formatter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- Formatter.cpp	6 Mar 2006 19:21:34 -0000	1.49
+++ Formatter.cpp	15 Mar 2006 21:34:02 -0000	1.50
@@ -38,27 +38,26 @@
 #include <mockpp/compat/AssertionFailedError.h>
 
 
-namespace mockpp
-{
+MOCKPP_NS_START
 
 #undef MOCKPP_ENABLE_DEFAULT_FORMATTER // one never knows..
 
 
-namespace {
+MOCKPP_ANON_NS_START
 
 template <typename T, typename uT>
-mockpp::String MOCKPP_EXPORT number_stpl( T n, unsigned base )
+MOCKPP_NS::String MOCKPP_EXPORT number_stpl( T n, unsigned base )
 {
   if ( base < 2 || base > 36 )
   {
-    mockpp::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of T to String: base %1 not allowed" ) );
+    MOCKPP_NS::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of T to String: base %1 not allowed" ) );
     fmt << number( ( uT ) base, 10 );
-    mockpp::assertionFailed( __LINE__, __FILE__, fmt );
+    MOCKPP_NS::assertionFailed( __LINE__, __FILE__, fmt );
   }
 
-  mockpp::Char charbuf[ sizeof(T) * 65 * sizeof( mockpp::Char ) ];
-  mockpp::Char *buf = ( mockpp::Char* ) charbuf;
-  mockpp::Char *p = &buf[ sizeof(T) * 64 ];
+  MOCKPP_NS::Char charbuf[ sizeof(T) * 65 * sizeof( MOCKPP_NS::Char ) ];
+  MOCKPP_NS::Char *buf = ( MOCKPP_NS::Char* ) charbuf;
+  MOCKPP_NS::Char *p = &buf[ sizeof(T) * 64 ];
   *p = MOCKPP_CHAR( '\0' );
   int len = 0;
   bool neg;
@@ -71,7 +70,7 @@
     if ( n == INT_MIN )
 #endif
     {
-      mockpp::String s1, s2;
+      MOCKPP_NS::String s1, s2;
       s1 = number( n / ( T ) base, base );
 #if defined(_MSC_VER) && (_MSC_VER <= 1200)
       s2 = number( ( unsigned T ) ( -( n + ( T ) base ) ) % base, base );
@@ -103,36 +102,36 @@
   return p;
 }
 
-} // anon ns
+MOCKPP_NS_END
 
 
-mockpp::String MOCKPP_EXPORT number( long n, unsigned base )
+MOCKPP_NS::String MOCKPP_EXPORT number( long n, unsigned base )
 {
   return number_stpl<long, unsigned long>(n, base);
 }
 
 
-mockpp::String MOCKPP_EXPORT number( long long n, unsigned base )
+MOCKPP_NS::String MOCKPP_EXPORT number( long long n, unsigned base )
 {
   return number_stpl<long long, unsigned long long>(n, base);
 }
 
 
-namespace {
+MOCKPP_ANON_NS_START
 
 template <typename T>
-mockpp::String MOCKPP_EXPORT number_utpl(T n, unsigned base )
+MOCKPP_NS::String MOCKPP_EXPORT number_utpl(T n, unsigned base )
 {
   if ( base < 2 || base > 36 )
   {
-    mockpp::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of unsigned T to String: base %1 not allowed" ) );
+    MOCKPP_NS::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of unsigned T to String: base %1 not allowed" ) );
     fmt << number( ( T ) base, 10 );
-    mockpp::assertionFailed( __LINE__, __FILE__, fmt );
+    MOCKPP_NS::assertionFailed( __LINE__, __FILE__, fmt );
   }
 
-  mockpp::Char charbuf[ sizeof(T) * 65 * sizeof( mockpp::Char ) ];
-  mockpp::Char *buf = ( mockpp::Char* ) charbuf;
-  mockpp::Char *p = &buf[ sizeof(T) * 64 ];
+  MOCKPP_NS::Char charbuf[ sizeof(T) * 65 * sizeof( MOCKPP_NS::Char ) ];
+  MOCKPP_NS::Char *buf = ( MOCKPP_NS::Char* ) charbuf;
+  MOCKPP_NS::Char *p = &buf[ sizeof(T) * 64 ];
   int len = 0;
   *p = MOCKPP_CHAR( '\0' );
   do
@@ -146,22 +145,22 @@
   return p;
 }
 
-} // anon ns
+MOCKPP_NS_END
 
 
-mockpp::String MOCKPP_EXPORT number( unsigned long n, unsigned base )
+MOCKPP_NS::String MOCKPP_EXPORT number( unsigned long n, unsigned base )
 {
   return number_utpl<unsigned long>(n, base);
 }
 
 
-mockpp::String MOCKPP_EXPORT number( unsigned long long n, unsigned base )
+MOCKPP_NS::String MOCKPP_EXPORT number( unsigned long long n, unsigned base )
 {
   return number_utpl<unsigned long long>(n, base);
 }
 
 
-mockpp::String MOCKPP_EXPORT number( double n, unsigned prec )
+MOCKPP_NS::String MOCKPP_EXPORT number( double n, unsigned prec )
 {
   if ( prec > 99 )
     prec = 99;
@@ -192,9 +191,9 @@
 #endif
 
 #ifdef MOCKPP_UNICODE
-  return mockpp::getUnicode( buf );
+  return MOCKPP_NS::getUnicode( buf );
 #else
-  return mockpp::String( buf );
+  return MOCKPP_NS::String( buf );
 #endif
 }
 
@@ -202,14 +201,14 @@
 /** Helper function.
   * @internal
   */
-static bool findArg( mockpp::String &fmt, int& pos, int& len )
+static bool findArg( MOCKPP_NS::String &fmt, int& pos, int& len )
 {
-  mockpp::Char lowest = 0;
+  MOCKPP_NS::Char lowest = 0;
   for ( unsigned int i = 0; i < fmt.length(); i++ )
   {
     if ( fmt[ i ] == MOCKPP_CHAR( '%' ) && i + 1 < fmt.length() )
     {
-      mockpp::Char dig = fmt[ i + 1 ];
+      MOCKPP_NS::Char dig = fmt[ i + 1 ];
       if ( dig >= MOCKPP_CHAR( '0' ) && dig <= MOCKPP_CHAR( '9' ) )
       {
         if ( !lowest || dig < lowest )
@@ -225,7 +224,7 @@
 }
 
 
-String & MOCKPP_EXPORT replaceFormatterString(mockpp::String &formatter, const String &repdata)
+String & MOCKPP_EXPORT replaceFormatterString(MOCKPP_NS::String &formatter, const String &repdata)
 {
   int pos, len;
 
@@ -269,17 +268,17 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const int &repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const int &repdata )
 {
-  formatter << mockpp::number( ( long ) repdata );
+  formatter << MOCKPP_NS::number( ( long ) repdata );
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const bool &repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const bool &repdata )
 {
   formatter << (repdata ? MOCKPP_PCHAR( "true" )
                         : MOCKPP_PCHAR( "false" ));
@@ -287,109 +286,109 @@
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const unsigned int &repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const unsigned int &repdata )
 {
-  formatter << mockpp::number( ( unsigned long ) repdata );
+  formatter << MOCKPP_NS::number( ( unsigned long ) repdata );
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const unsigned long &repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const unsigned long &repdata )
 {
-  formatter << mockpp::number( repdata );
+  formatter << MOCKPP_NS::number( repdata );
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const signed char &repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const signed char &repdata )
 {
-  formatter << mockpp::charToReadable(repdata);
+  formatter << MOCKPP_NS::charToReadable(repdata);
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const char &repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const char &repdata )
 {
-  formatter << mockpp::charToReadable(repdata);
+  formatter << MOCKPP_NS::charToReadable(repdata);
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const unsigned char &repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const unsigned char &repdata )
 {
-  formatter << mockpp::charToReadable(repdata);
+  formatter << MOCKPP_NS::charToReadable(repdata);
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const char *repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const char *repdata )
 {
   formatter << MOCKPP_STL::string(repdata);
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const float &repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const float &repdata )
 {
-  formatter << mockpp::number( repdata );
+  formatter << MOCKPP_NS::number( repdata );
   return formatter;
 }
 
 
 #ifdef MOCKPP_UNICODE
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const wchar_t &repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const wchar_t &repdata )
 {
-  formatter << mockpp::charToReadable(repdata);
+  formatter << MOCKPP_NS::charToReadable(repdata);
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const wchar_t * repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const wchar_t * repdata )
 {
-  formatter << mockpp::String(repdata);
+  formatter << MOCKPP_NS::String(repdata);
   return formatter;
 }
 
 #endif
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const long &repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const long &repdata )
 {
-  formatter << mockpp::number( repdata );
+  formatter << MOCKPP_NS::number( repdata );
   return formatter;
 }
 
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const double &repdata )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const double &repdata )
 {
-  formatter << mockpp::number( repdata );
+  formatter << MOCKPP_NS::number( repdata );
   return formatter;
 }
 
 
 #ifdef MOCKPP_UNICODE
 
-mockpp::String & MOCKPP_EXPORT operator << ( mockpp::String &formatter, const MOCKPP_STL::string &str )
+MOCKPP_NS::String & MOCKPP_EXPORT operator << ( MOCKPP_NS::String &formatter, const MOCKPP_STL::string &str )
 {
-  formatter << mockpp::getUnicode( str );
+  formatter << MOCKPP_NS::getUnicode( str );
   return formatter;
 }
 
 #else
 
-// mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const MOCKPP_STL::basic_string<wchar_t> &str)
+// MOCKPP_NS::String & MOCKPP_EXPORT operator << (MOCKPP_NS::String &formatter, const MOCKPP_STL::basic_string<wchar_t> &str)
 // {
-//   formatter << mockpp::getLatin1(str);
+//   formatter << MOCKPP_NS::getLatin1(str);
 //   return formatter;
 // }
 
 #endif
 
 
-mockpp::String & MOCKPP_EXPORT operator << (mockpp::String &formatter, const mockpp::String &repdata)
+MOCKPP_NS::String & MOCKPP_EXPORT operator << (MOCKPP_NS::String &formatter, const MOCKPP_NS::String &repdata)
 {
-  return mockpp::replaceFormatterString(formatter, repdata);
+  return MOCKPP_NS::replaceFormatterString(formatter, repdata);
 }
 
 

Index: Asserter.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Asserter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Asserter.h	29 Dec 2005 19:29:50 -0000	1.2
+++ Asserter.h	15 Mar 2006 21:34:02 -0000	1.3
@@ -35,7 +35,7 @@
 #include <mockpp/compat/AssertionFailedError.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 /** Asserts that a condition is true. If it isn't it throws
@@ -307,7 +307,7 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 /** Asserts that two values are equal.
@@ -316,7 +316,7 @@
   * @param a          first value
   * @param b          second value
   */
-#define MOCKPP_ASSERT_EQUALS_MESSAGE(msg, a, b)  mockpp::assertEquals(__LINE__, __FILE__, msg, a, b)
+#define MOCKPP_ASSERT_EQUALS_MESSAGE(msg, a, b)  MOCKPP_NS::assertEquals(__LINE__, __FILE__, msg, a, b)
 
 /** @def MOCKPP_ASSERT_EQUALS
   * @ingroup grp_helper
@@ -326,7 +326,7 @@
   * @param b          second value
   */
 
-# define MOCKPP_ASSERT_EQUALS(a, b)  mockpp::assertEquals(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \
+# define MOCKPP_ASSERT_EQUALS(a, b)  MOCKPP_NS::assertEquals(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \
                                                           MOCKPP_PCHAR(#a) MOCKPP_PCHAR(" == ") MOCKPP_PCHAR(#b), a, b)
 
 /** Asserts that two values are equal concerning a delta.
@@ -336,7 +336,7 @@
   * @param b          second value
   * @param delta      maximal difference a to b
   */
-#define MOCKPP_ASSERT_DELTA_MESSAGE(msg, a, b, delta)  mockpp::assertDelta(__LINE__, __FILE__, msg, a, b, delta)
+#define MOCKPP_ASSERT_DELTA_MESSAGE(msg, a, b, delta)  MOCKPP_NS::assertDelta(__LINE__, __FILE__, msg, a, b, delta)
 
 /** @def MOCKPP_ASSERT_DELTA
   * @ingroup grp_helper
@@ -347,7 +347,7 @@
   * @param delta      maximal difference a to b
   */
 
-# define MOCKPP_ASSERT_DELTA(a, b, delta)  mockpp::assertDelta(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \
+# define MOCKPP_ASSERT_DELTA(a, b, delta)  MOCKPP_NS::assertDelta(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \
                                                                MOCKPP_PCHAR(#a) MOCKPP_PCHAR(" +- ") MOCKPP_PCHAR(#delta) \
                                                                MOCKPP_PCHAR(" == ") MOCKPP_PCHAR(#b), a, b, delta)
 
@@ -358,7 +358,7 @@
   * @param up         upper boundary
   * @param a          value
   */
-#define MOCKPP_ASSERT_BOUNDARY_MESSAGE(msg, lo, up, a)  mockpp::assertBoundary(__LINE__, __FILE__, msg, lo, up, a)
+#define MOCKPP_ASSERT_BOUNDARY_MESSAGE(msg, lo, up, a)  MOCKPP_NS::assertBoundary(__LINE__, __FILE__, msg, lo, up, a)
 
 /** @def MOCKPP_ASSERT_BOUNDARY
   * @ingroup grp_helper
@@ -369,7 +369,7 @@
   * @param a          value
   */
 
-# define MOCKPP_ASSERT_BOUNDARY(lo, up, a)  mockpp::assertBoundary(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \
+# define MOCKPP_ASSERT_BOUNDARY(lo, up, a)  MOCKPP_NS::assertBoundary(__LINE__, __FILE__, MOCKPP_PCHAR("invalid: ") \
                                                                    MOCKPP_PCHAR(#lo) MOCKPP_PCHAR(" < ") MOCKPP_PCHAR(#a) \
                                                                    MOCKPP_PCHAR(" < ") MOCKPP_PCHAR(#up), lo, up, a)
 
@@ -378,7 +378,7 @@
   * @param msg        a human readable description about the cause
   * @param cond       boolean condition
   */
-#define MOCKPP_ASSERT_TRUE_MESSAGE(msg, cond) mockpp::assertTrue(__LINE__, __FILE__, msg, cond)
+#define MOCKPP_ASSERT_TRUE_MESSAGE(msg, cond) MOCKPP_NS::assertTrue(__LINE__, __FILE__, msg, cond)
 
 /** @def MOCKPP_ASSERT_TRUE
   * @ingroup grp_helper
@@ -387,14 +387,14 @@
   * @param cond       boolean condition
   */
 
-# define MOCKPP_ASSERT_TRUE(cond) mockpp::assertTrue(__LINE__, __FILE__, MOCKPP_PCHAR("!true: ") MOCKPP_PCHAR(#cond), cond)
+# define MOCKPP_ASSERT_TRUE(cond) MOCKPP_NS::assertTrue(__LINE__, __FILE__, MOCKPP_PCHAR("!true: ") MOCKPP_PCHAR(#cond), cond)
 
 /** Asserts that a condition is false.
   * @ingroup grp_helper
   * @param msg        a human readable description about the cause
   * @param cond       boolean condition
   */
-#define MOCKPP_ASSERT_FALSE_MESSAGE(msg, cond) mockpp::assertFalse(__LINE__, __FILE__, msg, cond)
+#define MOCKPP_ASSERT_FALSE_MESSAGE(msg, cond) MOCKPP_NS::assertFalse(__LINE__, __FILE__, msg, cond)
 
 /** @def MOCKPP_ASSERT_FALSE
   * @ingroup grp_helper
@@ -403,13 +403,13 @@
   * @param cond       boolean condition
   */
 
-# define MOCKPP_ASSERT_FALSE(cond) mockpp::assertFalse(__LINE__, __FILE__, MOCKPP_PCHAR("!false: ") MOCKPP_PCHAR(#cond), cond)
+# define MOCKPP_ASSERT_FALSE(cond) MOCKPP_NS::assertFalse(__LINE__, __FILE__, MOCKPP_PCHAR("!false: ") MOCKPP_PCHAR(#cond), cond)
 
 /** Unconditionally throws an AssertionFailedError.
   * @ingroup grp_helper
   * @param msg        a human readable description about the cause
   */
-#define MOCKPP_FAIL(msg)  mockpp::fail(__LINE__, __FILE__, msg)
+#define MOCKPP_FAIL(msg)  MOCKPP_NS::fail(__LINE__, __FILE__, msg)
 
 
 #endif // MOCKPP_ASSERT_H

Index: AssertionFailedError.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/AssertionFailedError.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- AssertionFailedError.cpp	29 Dec 2005 19:29:50 -0000	1.18
+++ AssertionFailedError.cpp	15 Mar 2006 21:34:02 -0000	1.19
@@ -32,7 +32,7 @@
 #include <mockpp/compat/AssertionFailedError.h>
 
 
-namespace mockpp {
+MOCKPP_NS_START
 
 
 MOCKPP_EXPORT
@@ -77,7 +77,7 @@
 }
 
 
-} // namespace mockpp
+MOCKPP_NS_END
 
 
 

[Mockpp-commits] mockpp/mockpp/bugs/boost test.cpp,1.2,1.3 tuple.cpp,1.1,1.2

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/bugs/boost
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/bugs/boost

Modified Files:
	test.cpp tuple.cpp 
Log Message:
optionally disable mockpp namespace

Index: tuple.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/bugs/boost/tuple.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tuple.cpp	31 Jul 2005 11:19:23 -0000	1.1
+++ tuple.cpp	15 Mar 2006 21:34:01 -0000	1.2
@@ -26,7 +26,7 @@
  virtual int bar ( const tuple_t& ){}
  };
 
- class mock : public mockpp::VisitableMockObject,
+ class mock : public MOCKPP_NS::VisitableMockObject,
  public Foo
  {
  mock ():

Index: test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/bugs/boost/test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test.cpp	31 Jul 2005 14:21:50 -0000	1.2
+++ test.cpp	15 Mar 2006 21:34:01 -0000	1.3
@@ -11,7 +11,7 @@
 
 typedef variant<int, string> var_t;
 
- mockpp::String& operator<<(mockpp::String& s, const var_t& t)
+ MOCKPP_NS::String& operator<<(MOCKPP_NS::String& s, const var_t& t)
  {
    s << MOCKPP_PCHAR("var_t");
    return s;
@@ -23,7 +23,7 @@
  virtual int bar ( const var_t& ){}
  };
 
- class mock : public mockpp::VisitableMockObject,
+ class mock : public MOCKPP_NS::VisitableMockObject,
  public Foo
  {
    public:

[Mockpp-commits] mockpp/mockpp/bugs list_test.cpp,1.1,1.2

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/bugs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/bugs

Modified Files:
	list_test.cpp 
Log Message:
optionally disable mockpp namespace

Index: list_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/bugs/list_test.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- list_test.cpp	4 Feb 2006 14:51:07 -0000	1.1
+++ list_test.cpp	15 Mar 2006 21:34:01 -0000	1.2
@@ -6,9 +6,9 @@
         virtual void check( xml::xistream& xis ) = 0;
     };
 
-    typedef mockpp::Invocation1< xml::xistream > Invocation;
+    typedef MOCKPP_NS::Invocation1< xml::xistream > Invocation;
 
-    class xistream_matcher : public mockpp::InvocationMatcher< Invocation >
+    class xistream_matcher : public MOCKPP_NS::InvocationMatcher< Invocation >
     {
     public:
         xistream_matcher( xistream_constraint& constraint )
@@ -61,18 +61,18 @@
         const std::string content_;
     };
 
-    class mock_custom_class : public mockpp::ChainableMockObject
+    class mock_custom_class : public MOCKPP_NS::ChainableMockObject
     {
     public:
         mock_custom_class()
-            : mockpp::ChainableMockObject( "mock_custom_class", 0 )
+            : MOCKPP_NS::ChainableMockObject( "mock_custom_class", 0 )
             , process_mocker             ( "process", this )
         {}
         void process( xml::xistream& xis )
         {
             process_mocker.forward( xis );
         }
-        mockpp::ChainableMockMethod< void, xml::xistream > process_mocker;
+        MOCKPP_NS::ChainableMockMethod< void, xml::xistream > process_mocker;
     };
 }
 
@@ -100,11 +100,11 @@
 
 namespace
 {
-    class mock_custom_class_with_parameters : public mockpp::ChainableMockObject
+    class mock_custom_class_with_parameters : public MOCKPP_NS::ChainableMockObject
     {
     public:
         mock_custom_class_with_parameters()
-            : mockpp::ChainableMockObject( "mock_custom_class", 0 )
+            : MOCKPP_NS::ChainableMockObject( "mock_custom_class", 0 )
             , process_mocker             ( "process", this )
         {}
         void process( xml::xistream& xis, int& p1, const float& p2 )
@@ -113,7 +113,7 @@
             BOOST_CHECK_EQUAL( 12.42f, p2 ); // $$$$ MAT 2006-02-04: forward to the mock instead
             process_mocker.forward( xis );
         }
-        mockpp::ChainableMockMethod< void, xml::xistream > process_mocker;
+        MOCKPP_NS::ChainableMockMethod< void, xml::xistream > process_mocker;
     };
 }
 

[Mockpp-commits] mockpp ChangeLog,1.100,1.101 run-configure-unicode.sh,1.17,1.18

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763

Modified Files:
	ChangeLog run-configure-unicode.sh 
Log Message:
optionally disable mockpp namespace

Index: run-configure-unicode.sh
===================================================================
RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- run-configure-unicode.sh	2 Jan 2006 15:40:21 -0000	1.17
+++ run-configure-unicode.sh	15 Mar 2006 21:33:55 -0000	1.18
@@ -17,7 +17,7 @@
 #OPTS="--enable-doxygen --enable-docbook"
 OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions  --disable-rtti
 OPTS="$OPTS --enable-debug=full"
-#OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit"
+OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit"
 #OPTS="$OPTS --disable-builtin-cxxtest --enable-boosttest"
 
 CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure  --enable-unicode $OPTS --prefix=/tmp/mockpp-install

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- ChangeLog	12 Mar 2006 08:26:32 -0000	1.100
+++ ChangeLog	15 Mar 2006 21:33:55 -0000	1.101
@@ -2,9 +2,11 @@
 
                             mockpp history
                             --------------
-2006-03-12  1.11.4
+2006-03-16  1.11.4
 
  - added script to retrieve data from configure
+ - added compiler switch to disable mockpp namespace
+   to enable older compilers
 
 2006-03-05  1.11.3
 

[Mockpp-commits] mockpp ChangeLog,1.99,1.100

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12520

Modified Files:
	ChangeLog 
Log Message:
added script to retrieve data from configure 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- ChangeLog	6 Mar 2006 18:05:56 -0000	1.99
+++ ChangeLog	12 Mar 2006 08:26:32 -0000	1.100
@@ -2,6 +2,10 @@
 
                             mockpp history
                             --------------
+2006-03-12  1.11.4
+
+ - added script to retrieve data from configure
+
 2006-03-05  1.11.3
 
  - fix for potential 64bit problem

[Mockpp-commits] mockpp mockpp-config.in,NONE,1.1 configure.in,1.113,1.114

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11869

Modified Files:
	configure.in 
Added Files:
	mockpp-config.in 
Log Message:
added script to retrieve data from configure 

--- NEW FILE: mockpp-config.in ---
#!/bin/sh
# Output mockpp related data generated by the configure script

# Taken from MARIE project (http://marie.sf.net)

prefix=@prefix@
exec_prefix=@exec_prefix@

bindir=@bindir@
sbindir=@sbindir@
libexecdir=@libexecdir@
datadir=@prefix@
sysconfdir=@sysconfdir@
sharedstatedir=@sharedstatedir@
localstatedir=@localstatedir@
libdir=@libdir@
infodir=@infodir@
mandir=@mandir@
includedir=@includedir@
pkgdatadir=${datadir}/@PACKAGE@
pkglibdir=${libdir}/@PACKAGE@
pkgincludedir=${includedir}/@PACKAGE@
MODULE_VERSION=@PACKAGE@-@VERSION@
module_dirs="$libdir"

DEFS="@DEFS@"
LIBS="@LIBS@"
LDFLAGS="@LDFLAGS@"

# stolen from autoconf
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
    ac_n= ac_c='
' ac_t='	'
  else
    ac_n=-n ac_c= ac_t=
  fi
else
  ac_n= ac_c='\c' ac_t=
fi

usage()
{
    exit_code=$1

    cat <<EOF
Usage: mockpp-config [OPTION]... [LIBRARY]...

Generic options
  --version	output mockpp version information.
  --modversion  output the module version information.
  --help	display this help and exit.

Compilation support options
  --cflags	print pre-processor and compiler flags
  --libs	print library linking information
  --libs-only-L	only print the -L/-R part of --libs
  --libs-only-l only print the -l part of --libs

Install directories mockpp was configured to
  --prefix  --exec-prefix  --bindir  --sbindir  --libexecdir  --datadir
  --sysconfdir  --sharedstatedir  --localstatedir  --libdir  --infodir
  --mandir  --includedir --toolboxdir

Known values for LIBRARY are:

    libmockpp      (mockpp library)
    config         (Stuff found by autoconf)

EOF
    exit $exit_code
}

if test $# -eq 0; then
    usage 1
fi

cflags=false
libs_L=false
libs_l=false
modversion=false

while test $# -gt 0; do
    case "$1" in
    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
    *) optarg= ;;
    esac

    case $1 in
    --version)
	echo @PACKAGE@ @VERSION@
	exit 0
	;;
    --exec-prefix)
	echo $exec_prefix
	exit 0
	;;
    --prefix)
	echo $prefix
	exit 0
	;;
    --*dir)
	dirname=\$`echo $1 | sed -e 's,^--,,'`
	dirname=`eval echo $dirname`
	test -z "$dirname" && exit 1
	echo $dirname
	exit 0
	;;
    --help)
	usage 0
	;;
    --cflags)
       	cflags=true
       	;;
    --libs)
       	libs_L=true
	libs_l=true
       	;;
    --libs-only-L)
	libs_L=true
	;;
    --libs-only-l)
	libs_l=true
	;;
    --modversion)
        modversion=true
	;;
    --*)
	usage 1
	;;
    libmockpp)
	the_libs="$the_libs -L$libdir -lmockpp "
	the_flags="$the_flags -I$includedir "
	;;
    config)
	the_libs="$the_libs $LD_FLAGS $LIBS"
	the_flags="$the_flags $DEFS"
	;;
    *)
        error=true
        for dir in `echo $module_dirs | sed 's/:/ /g'`; do
   	    cnf_sh=${dir}/${1}Conf.sh
	    if test -f ${cnf_sh}; then
    		. ${cnf_sh}
    		up_name=`echo $1 | tr a-z A-Z`
    		cnf_libdir=\$${up_name}_LIBDIR
    		cnf_libs=\$${up_name}_LIBS
    		cnf_flags=\$${up_name}_INCLUDEDIR
    		the_libs="$the_libs `eval echo $cnf_libdir` `eval echo $cnf_libs`"
    		the_flags="$the_flags `eval echo $cnf_flags`"
		error=false
		break
    	    fi
        done
	if $error; then
	    echo Unknown library \`$1\' 1>&2
	fi
	;;
    esac
    shift
done

if $cflags; then
    all_flags="$the_flags"
fi

if $libs_L || $libs_l; then
    all_flags="$all_flags $the_libs"
fi

if $modversion; then
    echo $MODULE_VERSION
    exit 0
fi

if test -z "$all_flags" || test "x$all_flags" = "x "; then
    exit 1
fi

# Straight out any possible duplicates, but be careful to
# get `-lfoo -lbar -lbaz' for `-lfoo -lbaz -lbar -lbaz'
other_flags=
lib_L_flags=
rev_libs=
for i in $all_flags; do
    case "$i" in
    # a library, save it for later, in reverse order
    -l*) rev_libs="$i $rev_libs" ;;
    -L*|-R*)
	if $libs_L; then
	    case " $lib_L_flags " in
	    *\ $i\ *) ;;			# already there
	    *) lib_L_flags="$lib_L_flags $i" ;;	# add it to output
	    esac
	fi;;
    *)
	case " $other_flags " in
	*\ $i\ *) ;;				# already there
	*) other_flags="$other_flags $i" ;;	# add it to output
        esac ;;
    esac
done

ord_libs=
if $libs_l; then
    for i in $rev_libs; do
	case " $ord_libs " in
	*\ $i\ *) ;;			# already there
	*) ord_libs="$i $ord_libs" ;;	# add it to output in reverse order
	esac
    done
fi


echo $other_flags $lib_L_flags $ord_libs

exit 0

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- configure.in	6 Mar 2006 19:29:19 -0000	1.113
+++ configure.in	12 Mar 2006 08:25:53 -0000	1.114
@@ -17,7 +17,7 @@
 #
 MOCKPP_MAJOR_VERSION=1
 MOCKPP_MINOR_VERSION=11
-MOCKPP_PATCH_VERSION=3
+MOCKPP_PATCH_VERSION=4
 
 MOCKPP_MICRO_VERSION=38
 MOCKPP_INTERFACE_AGE=0
@@ -464,6 +464,7 @@
 
 AC_OUTPUT(\
   mockpp.spec \
+  mockpp-config \
   mockpp.doxygen \
   \
   Makefile \

[Mockpp-commits] mockpp/mockpp/docs/en appendix.docbook,1.23,1.24 index.docbook,1.39,1.40

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/docs/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11869/mockpp/docs/en

Modified Files:
	appendix.docbook index.docbook 
Log Message:
added script to retrieve data from configure 

Index: appendix.docbook
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/appendix.docbook,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- appendix.docbook	4 Feb 2006 20:13:11 -0000	1.23
+++ appendix.docbook	12 Mar 2006 08:25:55 -0000	1.24
@@ -331,6 +331,14 @@
    </para></listitem>
  </varlistentry>
 
+ <varlistentry>
+   <term><filename>mockpp-config</filename></term>
+   <listitem><para>This script is generated by configure and can be used to
+   retrieve the configuration data for &mockpp; This may become useful when
+   integrating &mockpp; in other projects.
+   </para></listitem>
+ </varlistentry>
+
 </variablelist>
 
 </sect2>

Index: index.docbook
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/index.docbook,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- index.docbook	4 Feb 2006 20:13:11 -0000	1.39
+++ index.docbook	12 Mar 2006 08:25:55 -0000	1.40
@@ -14,7 +14,7 @@
   <!ENTITY copyyears    '2002-2006'                             >
   <!ENTITY mockpp_email 'mockpp at ewald-arnold dot de'         >
   <!ENTITY release_date '<pubdate>Published: <?dbtimestamp format="Y-m-d"?></pubdate>' >
-  <!ENTITY release_info '<releaseinfo>1.11.02</releaseinfo>' >
+  <!ENTITY release_info '<releaseinfo>1.11.04</releaseinfo>' >
 
   <!ENTITY chap_bookinfo               SYSTEM 'bookinfo.docbook'              >
   <!ENTITY chap_intro                  SYSTEM 'intro.docbook'                 >

[Mockpp-commits] mockpp/bcb5 basicmock.bpf,1.21,1.22 basicmock.bpr,1.26,1.27 chainmock.bpf,1.21,1.22 chainmock.bpr,1.26,1.27 chainmock2.bpf,1.5,1.6 chainmock2.bpr,1.6,1.7 cppunit.bpf,1.22,1.23 cppunit.bpr,1.29,1.30 gen-mak.bat,1.20,1.21 mock_greeter.bpf,1.24,1.25 mock_greeter.bpr,1.32,1.33 mock_test.bpf,1.46,1.47 mock_test.bpr,1.49,1.50 mock_test_win32.bpf,1.6,1.7 mock_test_win32.bpr,1.6,1.7 mockpp.bpf,1.33,1.34 mockpp.bpg,1.30,1.31 mockpp.bpr,1.56,1.57 mockpp_cxxtest.bpr,1.7,1.8 mockpp_production.bpr,1.20,1.21 poormock-se.bpf,1.15,1.16 poormock-se.bpr,1.20,1.21 poormock.bpf,1.21,1.22 poormock.bpr,1.26,1.27 readability.bpf,1.10,1.11 readability.bpr,1.14,1.15 verifying.bpf,1.19,1.20 verifying.bpr,1.24,1.25 visitmock.bpf,1.21,1.22 visitmock.bpr,1.25,1.26 visitmock2.bpf,1.5,1.6 visitmock2.bpr,1.6,1.7

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/bcb5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11869/bcb5

Modified Files:
	basicmock.bpf basicmock.bpr chainmock.bpf chainmock.bpr 
	chainmock2.bpf chainmock2.bpr cppunit.bpf cppunit.bpr 
	gen-mak.bat mock_greeter.bpf mock_greeter.bpr mock_test.bpf 
	mock_test.bpr mock_test_win32.bpf mock_test_win32.bpr 
	mockpp.bpf mockpp.bpg mockpp.bpr mockpp_cxxtest.bpr 
	mockpp_production.bpr poormock-se.bpf poormock-se.bpr 
	poormock.bpf poormock.bpr readability.bpf readability.bpr 
	verifying.bpf verifying.bpr visitmock.bpf visitmock.bpr 
	visitmock2.bpf visitmock2.bpr 
Log Message:
added script to retrieve data from configure 

Index: mock_greeter.bpr
===================================================================
RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_greeter.bpr,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- mock_greeter.bpr	2 Jan 2006 20:24:56 -0000	1.32
+++ mock_greeter.bpr	12 Mar 2006 08:25:54 -0000	1.33
@@ -3,12 +3,12 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.05.03"/>
-    <PROJECT value="c:\tmp\compile\mock_greeter_34.exe"/>
-    <OBJFILES value="c:\tmp\compile\mockpp_34\\mock_greeter.obj"/>
+    <PROJECT value="c:\tmp\compile\mock_greeter_38.exe"/>
+    <OBJFILES value="c:\tmp\compile\mockpp_38\\mock_greeter.obj"/>
     <RESFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="c:\tmp\compile\mockpp_34.lib c:\tmp\compile\mockpp_cxxtest_34.lib"/>
+    <LIBFILES value="c:\tmp\compile\mockpp_38.lib c:\tmp\compile\mockpp_cxxtest_38.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
@@ -26,16 +26,16 @@
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="mock_greeter.bpf"/>
     <INCLUDEPATH value="..\mockpp\examples;..\3party;..;$(BCB)\include;g:\data\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include;..\3party\cxxtest"/>
-    <LIBPATH value="..\mockpp\examples;..\mockpp_34\examples;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <LIBPATH value="..\mockpp\examples;..\mockpp_38\examples;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
   </MACROS>
   <OPTIONS>
     <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/>
-    <PFLAGS value="-N2&quot;c:\tmp\compile\mockpp_34\&quot; -N0&quot;c:\tmp\compile\mockpp_34\&quot; -$YD -$W 
+    <PFLAGS value="-N2&quot;c:\tmp\compile\mockpp_38\&quot; -N0&quot;c:\tmp\compile\mockpp_38\&quot; -$YD -$W 
       -$O- -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-l&quot;c:\tmp\compile\&quot; -I&quot;c:\tmp\compile\mockpp_34\&quot; -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-l&quot;c:\tmp\compile\&quot; -I&quot;c:\tmp\compile\mockpp_38\&quot; -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/>
@@ -82,47 +82,47 @@
 Item7=..\mockpp\examples;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;h:\home\arnold\cppunit-1.10.2\include\
 Item8=..\mockpp\examples;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
 Item9=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include
-Item10=..\mockpp\examples;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
-Item11=..\mockpp\examples;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include
-Item12=..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include
-Item13=..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include
-Item14=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include
-Item15=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include
-Item16=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include
-Item17=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include
-Item18=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include
+Item10=..\mockpp\examples;..\mockpp_38\examples;..\mockpp_38\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
+Item11=..\mockpp\examples;..\mockpp_38\examples;..\mockpp_38\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include
+Item12=..\mockpp_38\examples;..\mockpp_38\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include
+Item13=..\mockpp_38\examples;..\mockpp_38\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include
+Item14=..\mockpp_38\examples;..\mockpp_38\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include
+Item15=..\mockpp_38\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include
+Item16=..\mockpp_38\tests;..;$(BCB)\include;..\..\cppunit\include
+Item17=..\mockpp_38\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include
+Item18=..\mockpp_38\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include
 Item19=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include
-Item20=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include
+Item20=..\mockpp_38\tests;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include
 Item21=..;$(BCB)\include;X:\src\cppunit-1.8.0\include
-Item22=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include
-Item23=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include
-Item24=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include
-Item25=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\
-Item26=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\
-Item27=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include
-Item28=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl
-Item29=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat
+Item22=\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\tests;..\..\mockpp;..\mockpp_38\tests;..\mockpp;..\expat;$(BCB)\include
+Item23=..;..\mockpp_38\tests;..\mockpp;..\expat;$(BCB)\include
+Item24=..\..\mockpp;..\mockpp_38\tests;..\mockpp;..\expat;$(BCB)\include
+Item25=..\..\mockpp;..\mockpp_38\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\
+Item26=.. ;..\mockpp_38\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\
+Item27=.. ;..\mockpp_38\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include
+Item28=..\mockpp_38\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl
+Item29=..\mockpp_38\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat
 
 [HistoryLists\hlLibraryPath]
 Count=18
-Item0=..\mockpp\examples;..\mockpp_34\examples;$(BCB)\lib\obj;$(BCB)\lib
+Item0=..\mockpp\examples;..\mockpp_38\examples;$(BCB)\lib\obj;$(BCB)\lib
 Item1=$(BCB)\lib\obj;$(BCB)\lib
-Item2=..\mockpp_34\examples;..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
-Item3=..\mockpp_34\examples;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
-Item4=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
-Item5=..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
-Item6=..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat
-Item7=..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin
-Item8=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin
-Item9=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;output
-Item10=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_34\bcb5\output
-Item11=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output
-Item12=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib
-Item13=..\mockpp_34\apps;D:\CBuilder5\mockpp_34\;$(BCB)\lib\obj;$(BCB)\lib
-Item14=e:\Eigene Dateien\c++\mockpp_34\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
-Item15=e:\Eigene Dateien\c++\mockpp_34\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\mockpp_38\examples;..\mockpp_38\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\mockpp_38\examples;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\tests;..\mockpp_38\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
+Item4=\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\tests;..\mockpp_38\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
+Item5=..\mockpp_38\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
+Item6=..\mockpp_38\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat
+Item7=..\mockpp_38\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin
+Item8=..\mockpp_38\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin
+Item9=..\mockpp_38\apps;$(BCB)\lib\obj;$(BCB)\lib;output
+Item10=..\mockpp_38\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_38\bcb5\output
+Item11=..\mockpp_38\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output
+Item12=..\mockpp_38\apps;$(BCB)\lib\obj;$(BCB)\lib
+Item13=..\mockpp_38\apps;D:\CBuilder5\mockpp_38\;$(BCB)\lib\obj;$(BCB)\lib
+Item14=e:\Eigene Dateien\c++\mockpp_38\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
+Item15=e:\Eigene Dateien\c++\mockpp_38\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
 Item16=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
-Item17=e:\Eigene Dateien\c++\mockpp_34\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib
+Item17=e:\Eigene Dateien\c++\mockpp_38\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
@@ -136,35 +136,35 @@
 
 [HistoryLists\hlIntOutputDir]
 Count=7
-Item0=c:\tmp\compile\mockpp_34\
-Item1=c:\tmp\compile\mockpp_34\ulxr_bcb5\
+Item0=c:\tmp\compile\mockpp_38\
+Item1=c:\tmp\compile\mockpp_38\ulxr_bcb5\
 Item2=h:\temp
 Item3=output
-Item4=E:\Eigene Dateien\c++\mockpp_34\bcb5\output\
-Item5=E:\Eigene Dateien\c++\mockpp_34\bcb5\output
+Item4=E:\Eigene Dateien\c++\mockpp_38\bcb5\output\
+Item5=E:\Eigene Dateien\c++\mockpp_38\bcb5\output
 Item6=D:\CBuilder5\Projects\output\
 
 [HistoryLists\hlFinalOutputDir]
 Count=8
 Item0=c:\tmp\compile\
 Item1=c:\tmp\compile
-Item2=c:\tmp\compile\mockpp_34\
+Item2=c:\tmp\compile\mockpp_38\
 Item3=h:\temp
 Item4=output\
-Item5=E:\Eigene Dateien\c++\mockpp_34\bcb5\output\
-Item6=E:\Eigene Dateien\c++\mockpp_34\bcb5\output
+Item5=E:\Eigene Dateien\c++\mockpp_38\bcb5\output\
+Item6=E:\Eigene Dateien\c++\mockpp_38\bcb5\output
 Item7=output
 
 [HistoryLists\hIBPIOutputDir]
 Count=10
 Item0=c:\tmp\compile\
 Item1=c:\tmp\compile
-Item2=c:\tmp\compile\mockpp_34\
-Item3=c:\tmp\compile\mockpp_34\ulxr_bcb5\
+Item2=c:\tmp\compile\mockpp_38\
+Item3=c:\tmp\compile\mockpp_38\ulxr_bcb5\
 Item4=h:\temp
-Item5=e:\Eigene Dateien\c++\mockpp_34\bcb5\output\
+Item5=e:\Eigene Dateien\c++\mockpp_38\bcb5\output\
 Item6=output\
-Item7=E:\Eigene Dateien\c++\mockpp_34\bcb5\output
+Item7=E:\Eigene Dateien\c++\mockpp_38\bcb5\output
 Item8=D:\CBuilder5\Projects\output\
 Item9=output
 

Index: visitmock2.bpr
===================================================================
RCS file: /cvsroot/mockpp/mockpp/bcb5/visitmock2.bpr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- visitmock2.bpr	2 Jan 2006 20:24:56 -0000	1.6
+++ visitmock2.bpr	12 Mar 2006 08:25:55 -0000	1.7
@@ -4,12 +4,12 @@
   <MACROS>
     <VERSION value="BCB.05.03"/>
     <PROJECT value="c:\tmp\compile\visitmock2_34.exe"/>
-    <OBJFILES value="c:\tmp\compile\mockpp_34\\visitmock2.obj 
-      c:\tmp\compile\mockpp_34\\consumer.obj"/>
+    <OBJFILES value="c:\tmp\compile\mockpp_38\\visitmock2.obj 
+      c:\tmp\compile\mockpp_38\\consumer.obj"/>
     <RESFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="c:\tmp\compile\mockpp_34.lib"/>
+    <LIBFILES value="c:\tmp\compile\mockpp_38.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
@@ -27,16 +27,16 @@
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="visitmock2.bpf"/>
     <INCLUDEPATH value="..\mockpp\examples\tutorial;..\3party;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/>
-    <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_38\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
   </MACROS>
   <OPTIONS>
     <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/>
-    <PFLAGS value="-N2&quot;c:\tmp\compile\mockpp_34\&quot; -N0&quot;c:\tmp\compile\mockpp_34\&quot; -$YD -$W 
+    <PFLAGS value="-N2&quot;c:\tmp\compile\mockpp_38\&quot; -N0&quot;c:\tmp\compile\mockpp_38\&quot; -$YD -$W 
       -$O- -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-l&quot;c:\tmp\compile\&quot; -I&quot;c:\tmp\compile\mockpp_34\&quot; -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-l&quot;c:\tmp\compile\&quot; -I&quot;c:\tmp\compile\mockpp_38\&quot; -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/>
@@ -77,54 +77,54 @@
 Item1=..\3party;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
 Item2=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
 Item3=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include
-Item4=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
-Item5=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include
-Item6=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..;$(BCB)\include;..\..\..\cppunit.ups\include
-Item7=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include
-Item8=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include
-Item9=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include
-Item10=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include
-Item11=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include
-Item12=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include
+Item4=..\mockpp\examples\tutorial;..\mockpp_38\examples\tutorial;..\mockpp_38\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
+Item5=..\mockpp\examples\tutorial;..\mockpp_38\examples\tutorial;..\mockpp_38\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include
+Item6=..\mockpp_38\examples\tutorial;..\mockpp_38\examples;..;$(BCB)\include;..\..\..\cppunit.ups\include
+Item7=..\mockpp_38\examples\tutorial;..\mockpp_38\examples;..\mockpp_38\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include
+Item8=..\mockpp_38\examples;..\mockpp_38\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include
+Item9=..\mockpp_38\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include
+Item10=..\mockpp_38\tests;..;$(BCB)\include;..\..\cppunit\include
+Item11=..\mockpp_38\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include
+Item12=..\mockpp_38\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include
 Item13=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include
-Item14=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include
+Item14=..\mockpp_38\tests;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include
 Item15=..;$(BCB)\include;X:\src\cppunit-1.8.0\include
-Item16=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include
-Item17=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include
-Item18=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include
-Item19=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\
-Item20=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\
-Item21=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include
-Item22=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl
-Item23=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat
+Item16=\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\tests;..\..\mockpp;..\mockpp_38\tests;..\mockpp;..\expat;$(BCB)\include
+Item17=..;..\mockpp_38\tests;..\mockpp;..\expat;$(BCB)\include
+Item18=..\..\mockpp;..\mockpp_38\tests;..\mockpp;..\expat;$(BCB)\include
+Item19=..\..\mockpp;..\mockpp_38\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\
+Item20=.. ;..\mockpp_38\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\
+Item21=.. ;..\mockpp_38\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include
+Item22=..\mockpp_38\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl
+Item23=..\mockpp_38\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat
 Item24=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat
-Item25=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl
-Item26=..\mockpp_34\tests;..\mockpp;$(BCB)\include
-Item27=..\mockpp_34\tests;..\mockpp;$(BCB)/include
-Item28=..\mockpp_34\tests;..\mockpp
+Item25=..\mockpp_38\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl
+Item26=..\mockpp_38\tests;..\mockpp;$(BCB)\include
+Item27=..\mockpp_38\tests;..\mockpp;$(BCB)/include
+Item28=..\mockpp_38\tests;..\mockpp
 Item29=..\mockpp
 
 [HistoryLists\hlLibraryPath]
 Count=19
-Item0=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib
+Item0=..\mockpp\examples\tutorial;..\mockpp_38\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib
 Item1=$(BCB)\lib\obj;$(BCB)\lib
-Item2=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
-Item3=..\mockpp_34\examples;..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
-Item4=..\mockpp_34\examples;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
-Item5=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
-Item6=..\mockpp_34\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
-Item7=..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat
-Item8=..\mockpp_34\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin
-Item9=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin
-Item10=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;output
-Item11=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_34\bcb5\output
-Item12=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output
-Item13=..\mockpp_34\apps;$(BCB)\lib\obj;$(BCB)\lib
-Item14=..\mockpp_34\apps;D:\CBuilder5\mockpp_34\;$(BCB)\lib\obj;$(BCB)\lib
-Item15=e:\Eigene Dateien\c++\mockpp_34\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
-Item16=e:\Eigene Dateien\c++\mockpp_34\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\mockpp_38\examples\tutorial;..\mockpp_38\examples;..\mockpp_38\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\mockpp_38\examples;..\mockpp_38\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\mockpp_38\examples;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\tests;..\mockpp_38\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
+Item5=\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\tests;..\mockpp_38\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
+Item6=..\mockpp_38\tests;..\expat;$(BCB)\lib\obj;$(BCB)\lib
+Item7=..\mockpp_38\tests;$(BCB)\lib\obj;$(BCB)\lib;output;expat
+Item8=..\mockpp_38\tests;$(BCB)\lib\obj;$(BCB)\lib;output;bin
+Item9=..\mockpp_38\apps;$(BCB)\lib\obj;$(BCB)\lib;output;bin
+Item10=..\mockpp_38\apps;$(BCB)\lib\obj;$(BCB)\lib;output
+Item11=..\mockpp_38\apps;$(BCB)\lib\obj;$(BCB)\lib;E:\Eigene Dateien\c++\mockpp_38\bcb5\output
+Item12=..\mockpp_38\apps;$(BCB)\lib\obj;$(BCB)\lib;..\output
+Item13=..\mockpp_38\apps;$(BCB)\lib\obj;$(BCB)\lib
+Item14=..\mockpp_38\apps;D:\CBuilder5\mockpp_38\;$(BCB)\lib\obj;$(BCB)\lib
+Item15=e:\Eigene Dateien\c++\mockpp_38\mockpp\apps\;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
+Item16=e:\Eigene Dateien\c++\mockpp_38\mockpp\apps;..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
 Item17=..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
-Item18=e:\Eigene Dateien\c++\mockpp_34\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib
+Item18=e:\Eigene Dateien\c++\mockpp_38\mockpp\apps;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
@@ -138,35 +138,35 @@
 
 [HistoryLists\hlIntOutputDir]
 Count=7
-Item0=c:\tmp\compile\mockpp_34\
-Item1=c:\tmp\compile\mockpp_34\ulxr_bcb5\
+Item0=c:\tmp\compile\mockpp_38\
+Item1=c:\tmp\compile\mockpp_38\ulxr_bcb5\
 Item2=h:\temp
 Item3=output
-Item4=E:\Eigene Dateien\c++\mockpp_34\bcb5\output\
-Item5=E:\Eigene Dateien\c++\mockpp_34\bcb5\output
+Item4=E:\Eigene Dateien\c++\mockpp_38\bcb5\output\
+Item5=E:\Eigene Dateien\c++\mockpp_38\bcb5\output
 Item6=D:\CBuilder5\Projects\output\
 
 [HistoryLists\hlFinalOutputDir]
 Count=8
 Item0=c:\tmp\compile\
 Item1=c:\tmp\compile
-Item2=c:\tmp\compile\mockpp_34\
+Item2=c:\tmp\compile\mockpp_38\
 Item3=h:\temp
 Item4=output\
-Item5=E:\Eigene Dateien\c++\mockpp_34\bcb5\output\
-Item6=E:\Eigene Dateien\c++\mockpp_34\bcb5\output
+Item5=E:\Eigene Dateien\c++\mockpp_38\bcb5\output\
+Item6=E:\Eigene Dateien\c++\mockpp_38\bcb5\output
 Item7=output
 
 [HistoryLists\hIBPIOutputDir]
 Count=10
 Item0=c:\tmp\compile\
 Item1=c:\tmp\compile
-Item2=c:\tmp\compile\mockpp_34\
-Item3=c:\tmp\compile\mockpp_34\ulxr_bcb5\
+Item2=c:\tmp\compile\mockpp_38\
+Item3=c:\tmp\compile\mockpp_38\ulxr_bcb5\
 Item4=h:\temp
-Item5=e:\Eigene Dateien\c++\mockpp_34\bcb5\output\
+Item5=e:\Eigene Dateien\c++\mockpp_38\bcb5\output\
 Item6=output\
-Item7=E:\Eigene Dateien\c++\mockpp_34\bcb5\output
+Item7=E:\Eigene Dateien\c++\mockpp_38\bcb5\output
 Item8=D:\CBuilder5\Projects\output\
 Item9=output
 

Index: mock_test.bpf
===================================================================
RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test.bpf,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- mock_test.bpf	9 Jan 2006 20:15:07 -0000	1.46
+++ mock_test.bpf	12 Mar 2006 08:25:54 -0000	1.47
@@ -2,9 +2,9 @@
 This file is used by the project manager only and should be treated like the project file
 main
 //---------------------------------------------------------------------------
-USELIB("c:\tmp\compile\mockpp_34.lib");
-USELIB("c:\tmp\compile\mockpp_production_34.lib");
-USELIB("c:\tmp\compile\mockpp_cxxtest_34.lib");
+USELIB("c:\tmp\compile\mockpp_38.lib");
+USELIB("c:\tmp\compile\mockpp_production_38.lib");
+USELIB("c:\tmp\compile\mockpp_cxxtest_38.lib");
 //---------------------------------------------------------------------------
 USEUNIT("..\mockpp\tests\AssertMo_test.cpp");
 USEUNIT("..\mockpp\tests\ExpectationCounter_test.cpp");

Index: mockpp_cxxtest.bpr
===================================================================
RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp_cxxtest.bpr,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mockpp_cxxtest.bpr	4 Feb 2006 14:47:33 -0000	1.7
+++ mockpp_cxxtest.bpr	12 Mar 2006 08:25:55 -0000	1.8
@@ -3,15 +3,15 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.05.03"/>
-    <PROJECT value="c:\tmp\compile\mockpp_cxxtest_34.dll"/>
-    <OBJFILES value="c:\tmp\compile\mockpp_34\\Descriptions.obj 
-      c:\tmp\compile\mockpp_34\\DummyDescriptions.obj 
-      c:\tmp\compile\mockpp_34\\GlobalFixture.obj 
-      c:\tmp\compile\mockpp_34\\LinkedList.obj 
-      c:\tmp\compile\mockpp_34\\RealDescriptions.obj 
-      c:\tmp\compile\mockpp_34\\TestSuite.obj 
-      c:\tmp\compile\mockpp_34\\TestTracker.obj 
-      c:\tmp\compile\mockpp_34\\ValueTraits.obj"/>
+    <PROJECT value="c:\tmp\compile\mockpp_cxxtest_38.dll"/>
+    <OBJFILES value="c:\tmp\compile\mockpp_38\\Descriptions.obj 
+      c:\tmp\compile\mockpp_38\\DummyDescriptions.obj 
+      c:\tmp\compile\mockpp_38\\GlobalFixture.obj 
+      c:\tmp\compile\mockpp_38\\LinkedList.obj 
+      c:\tmp\compile\mockpp_38\\RealDescriptions.obj 
+      c:\tmp\compile\mockpp_38\\TestSuite.obj 
+      c:\tmp\compile\mockpp_38\\TestTracker.obj 
+      c:\tmp\compile\mockpp_38\\ValueTraits.obj"/>
     <RESFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
@@ -33,17 +33,17 @@
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="mockpp_cxxtest.bpf"/>
     <INCLUDEPATH value="..\3party\cxxtest\cxxtest;..\mockpp\3party\cxxtest\cxxtest;\\sonne\ewald\Documents\src\mockpp\mockpp\3party\cxxtest\cxxtest;..\mockpp\production;..;$(BCB)\include;..\3party\cxxtest;..\3party"/>
-    <LIBPATH value="..\3party\cxxtest\cxxtest;..\mockpp\3party\cxxtest\cxxtest;\\sonne\ewald\Documents\src\mockpp\mockpp\3party\cxxtest\cxxtest;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <LIBPATH value="..\3party\cxxtest\cxxtest;..\mockpp\3party\cxxtest\cxxtest;\\sonne\ewald\Documents\src\mockpp\mockpp\3party\cxxtest\cxxtest;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_38\matcher;..\mockpp_38\constraint;..\mockpp_38\builder;..\mockpp;..\mockpp_38\chaining;..\mockpp_38\compat;..\mockpp_38\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin 
       -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/>
   </MACROS>
   <OPTIONS>
     <CFLAG1 value="-WD -vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWD -tWM -c"/>
-    <PFLAGS value="-N2&quot;c:\tmp\compile\mockpp_34\&quot; -N0&quot;c:\tmp\compile\mockpp_34\&quot; -$YD -$W 
+    <PFLAGS value="-N2&quot;c:\tmp\compile\mockpp_38\&quot; -N0&quot;c:\tmp\compile\mockpp_38\&quot; -$YD -$W 
       -$O- -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zi"/>
-    <LFLAGS value="-l&quot;c:\tmp\compile\&quot; -I&quot;c:\tmp\compile\mockpp_34\&quot; -D&quot;&quot; -aa -Tpd -x -Gn -Gi 
+    <LFLAGS value="-l&quot;c:\tmp\compile\&quot; -I&quot;c:\tmp\compile\mockpp_38\&quot; -D&quot;&quot; -aa -Tpd -x -Gn -Gi 
       -v"/>
   </OPTIONS>
   <LINKER>
@@ -101,34 +101,34 @@
 Item17=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include
 Item18=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include
 Item19=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include
-Item20=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include
+Item20=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_38\matcher;..\mockpp_38\constraint;..\mockpp_38\builder;..\mockpp;..\mockpp_38\chaining;..\mockpp_38\compat;..\mockpp_38\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include
 Item21=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include
-Item22=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include
+Item22=..\mockpp_38\matcher;..\mockpp_38\constraint;..\mockpp_38\builder;..\mockpp_38\chaining;..\mockpp_38\compat;..\mockpp_38\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include
 Item23=..\mockpp;..;$(BCB)\include;..\..\..\cppunit.ups\include
-Item24=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include
-Item25=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include
-Item26=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.8.0\include
-Item27=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include
-Item28=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include
+Item24=..\mockpp_38\builder;..\mockpp_38\matcher;..\mockpp_38\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\matcher;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\constraint;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\builder;..\mockpp_38\chaining;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\chaining;mockpp;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp;..\mockpp_38\compat;..\mockpp_38\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include
+Item25=..\mockpp_38\builder;..\mockpp_38\matcher;..\mockpp_38\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\matcher;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\constraint;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\builder;..\mockpp_38\chaining;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\chaining;mockpp;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp;..\mockpp_38\compat;..\mockpp_38\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include
+Item26=mockpp;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp;..\mockpp_38\compat;..\mockpp_38\util;..\mockpp;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.8.0\include
+Item27=mockpp;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp;..\mockpp_38\compat;..\mockpp_38\util;..\mockpp;..\..\mockpp;$(BCB)\include
+Item28=mockpp;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp;..\mockpp_38\compat;..\mockpp_38\util;..\mockpp;..;$(BCB)\include
 Item29=..;$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
 Count=19
-Item0=\\sonne\ewald\Documents\src\mockpp\mockpp\3party\cxxtest\cxxtest;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib
-Item2=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib
-Item3=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib
-Item4=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
-Item5=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib
-Item6=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
+Item0=\\sonne\ewald\Documents\src\mockpp\mockpp\3party\cxxtest\cxxtest;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_38\matcher;..\mockpp_38\constraint;..\mockpp_38\builder;..\mockpp;..\mockpp_38\chaining;..\mockpp_38\compat;..\mockpp_38\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_38\matcher;..\mockpp_38\constraint;..\mockpp_38\builder;..\mockpp;..\mockpp_38\chaining;..\mockpp_38\compat;..\mockpp_38\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_38\matcher;..\mockpp_38\constraint;..\mockpp_38\builder;..\mockpp;..\mockpp_38\chaining;..\mockpp_38\compat;..\mockpp_38\util;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_38\matcher;..\mockpp_38\constraint;..\mockpp_38\builder;..\mockpp;..\mockpp_38\chaining;..\mockpp_38\compat;..\mockpp_38\util;..;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_38\matcher;..\mockpp_38\constraint;..\mockpp_38\builder;..\mockpp;..\mockpp_38\chaining;..\mockpp_38\compat;..\mockpp_38\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
+Item5=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_38\matcher;..\mockpp_38\constraint;..\mockpp_38\builder;..\mockpp;..\mockpp_38\chaining;..\mockpp_38\compat;..\mockpp_38\util;..;$(BCB)\lib\obj;$(BCB)\lib
+Item6=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_38\matcher;..\mockpp_38\constraint;..\mockpp_38\builder;..\mockpp;..\mockpp_38\chaining;..\mockpp_38\compat;..\mockpp_38\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
 Item7=..;$(BCB)\lib\obj;$(BCB)\lib
-Item8=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib
-Item9=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
-Item10=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;..\mockpp_34\compat;..\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\
-Item11=mockpp;..\mockpp_34\compat;..\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\
-Item12=..\mockpp_34\compat;..\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\
-Item13=..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\
-Item14=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_34\
+Item8=..\mockpp_38\matcher;..\mockpp_38\constraint;..\mockpp_38\builder;..\mockpp;..\mockpp_38\chaining;..\mockpp_38\compat;..\mockpp_38\util;..;$(BCB)\lib\obj;$(BCB)\lib
+Item9=..\mockpp_38\matcher;..\mockpp_38\constraint;..\mockpp_38\builder;..\mockpp;..\mockpp_38\chaining;..\mockpp_38\compat;..\mockpp_38\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
+Item10=..\mockpp_38\builder;..\mockpp_38\matcher;..\mockpp_38\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\matcher;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\constraint;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\builder;..\mockpp_38\chaining;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\chaining;mockpp;..\mockpp_38\compat;..\mockpp_38\util;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\compat;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\util;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp;..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_38\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_38\
+Item11=mockpp;..\mockpp_38\compat;..\mockpp_38\util;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\compat;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\util;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp;..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_38\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_38\
+Item12=..\mockpp_38\compat;..\mockpp_38\util;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\compat;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\util;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp;..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects\;\\SONNE\HOMES\src\ulxr\mockpp_38\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_38\
+Item13=..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_38\mockpp;..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_38\
+Item14=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;c:\tmp\compile\mockpp_38\
 Item15=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib;h:\temp
 Item16=..\mockpp;..\expat;$(BCB)\lib\obj;$(BCB)\lib
 Item17=..\expat;$(BCB)\lib\obj;$(BCB)\lib
@@ -149,8 +149,8 @@
 
 [HistoryLists\hlIntOutputDir]
 Count=4
-Item0=c:\tmp\compile\mockpp_34\
-Item1=c:\tmp\compile\mockpp_34\
+Item0=c:\tmp\compile\mockpp_38\
+Item1=c:\tmp\compile\mockpp_38\
 Item2=h:\temp
 Item3=output
 
@@ -158,7 +158,7 @@
 Count=6
 Item0=c:\tmp\compile\
 Item1=c:\tmp\compile\
-Item2=c:\tmp\compile\mockpp_34\
+Item2=c:\tmp\compile\mockpp_38\
 Item3=h:\temp
 Item4=output\
 Item5=output
@@ -167,9 +167,9 @@
 Count=6
 Item0=c:\tmp\compile\
 Item1=c:\tmp\compile\
-Item2=c:\tmp\compile\mockpp_34\
+Item2=c:\tmp\compile\mockpp_38\
 Item3=h:\temp
-Item4=E:\Eigene Dateien\c++\mockpp_34\bcb5\output\
+Item4=E:\Eigene Dateien\c++\mockpp_38\bcb5\output\
 Item5=output
 
 [Debugging]

Index: visitmock2.bpf
===================================================================
RCS file: /cvsroot/mockpp/mockpp/bcb5/visitmock2.bpf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- visitmock2.bpf	2 Jan 2006 20:24:56 -0000	1.5
+++ visitmock2.bpf	12 Mar 2006 08:25:55 -0000	1.6
@@ -1,4 +1,4 @@
-USELIB("c:\tmp\compile\mockpp_34.lib");
+USELIB("c:\tmp\compile\mockpp_38.lib");
 USEUNIT("..\mockpp\examples\tutorial\visitmock2.cpp");
 USEUNIT("..\mockpp\examples\tutorial\consumer.cpp");
 //---------------------------------------------------------------------------

Index: mock_test.bpr
===================================================================
RCS file: /cvsroot/mockpp/mockpp/bcb5/mock_test.bpr,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- mock_test.bpr	9 Jan 2006 20:15:07 -0000	1.49
+++ mock_test.bpr	12 Mar 2006 08:25:54 -0000	1.50
@@ -3,127 +3,127 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.05.03"/>
-    <PROJECT value="c:\tmp\compile\mock_test_34.exe"/>
-    <OBJFILES value="c:\tmp\compile\mockpp_34\\AssertMo_test.obj 
-      c:\tmp\compile\mockpp_34\\ExpectationCounter_test.obj 
-      c:\tmp\compile\mockpp_34\\ExpectationCounterRange_test.obj 
-      c:\tmp\compile\mockpp_34\\ExpectationList_test.obj 
-      c:\tmp\compile\mockpp_34\\ExpectationMap_test.obj 
-      c:\tmp\compile\mockpp_34\\ExpectationSegment_test.obj 
-      c:\tmp\compile\mockpp_34\\ExpectationSet_test.obj 
-      c:\tmp\compile\mockpp_34\\ExpectationValue_test.obj 
-      c:\tmp\compile\mockpp_34\\Formatter_test.obj 
-      c:\tmp\compile\mockpp_34\\mock_test.obj 
-      c:\tmp\compile\mockpp_34\\VerifyingTestCase_test.obj 
-      c:\tmp\compile\mockpp_34\\Assert_test.obj 
-      c:\tmp\compile\mockpp_34\\MockObject_test.obj 
-      c:\tmp\compile\mockpp_34\\mockpp_test.obj 
-      c:\tmp\compile\mockpp_34\\ReturnObjectList_test.obj 
-      c:\tmp\compile\mockpp_34\\Verifiable_test.obj 
-      c:\tmp\compile\mockpp_34\\TrackingCounter_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_void_test.obj 
-      c:\tmp\compile\mockpp_34\\Exception_test.obj 
-      c:\tmp\compile\mockpp_34\\ExpectationBoundary_test.obj 
-      c:\tmp\compile\mockpp_34\\Throwable_test.obj 
-      c:\tmp\compile\mockpp_34\\ThrowableList_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_1_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_1_void_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_2_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_2_void_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_3_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_3_void_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_4_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_4_void_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_5_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_5_void_test.obj 
-      c:\tmp\compile\mockpp_34\\MixedMockObject_5_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_template_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockObject_test.obj 
-      c:\tmp\compile\mockpp_34\\ExpectationConglomeration_test.obj 
-      c:\tmp\compile\mockpp_34\\TimeServer_test.obj 
-      c:\tmp\compile\mockpp_34\\classes_ABCDE.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockMethod_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockMethod_1_test.obj 
-      c:\tmp\compile\mockpp_34\\VisitableMockMethod_2_test.obj 
-      c:\tmp\compile\mockpp_34\\ResponseVector_test.obj 
-      c:\tmp\compile\mockpp_34\\NoException_test.obj 
-      c:\tmp\compile\mockpp_34\\AbstractDynamicChainingMock_test.obj 
-      c:\tmp\compile\mockpp_34\\AbstractInvocationDispatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\And_test.obj 
-      c:\tmp\compile\mockpp_34\\AnyArgumentsMatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\ArgumentsMatchBuilder_test.obj 
-      c:\tmp\compile\mockpp_34\\ArgumentsMatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockMethod_1_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockMethod_2_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockMethod_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObject_1_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObject_1_void_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObject_2_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObject_2_void_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObject_3_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObject_3_void_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObject_4_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObject_4_void_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObject_5_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObject_5_void_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObject_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObject_void_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainableMockObjectPolymorphism_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainingMockBuilder_test.obj 
-      c:\tmp\compile\mockpp_34\\ChainingMockObjectSupport_test.obj 
-      c:\tmp\compile\mockpp_34\\ConstraintList_test.obj 
-      c:\tmp\compile\mockpp_34\\ConstraintSet_test.obj 
-      c:\tmp\compile\mockpp_34\\CoreMock_test.obj 
-      c:\tmp\compile\mockpp_34\\CustomStub_test.obj 
-      c:\tmp\compile\mockpp_34\\DefaultResultStub_test.obj 
-      c:\tmp\compile\mockpp_34\\DynamicChainingMockError_test.obj 
-      c:\tmp\compile\mockpp_34\\FIFOInvocationDispatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\Invocation_test.obj 
-      c:\tmp\compile\mockpp_34\\InvocationMocker_test.obj 
-      c:\tmp\compile\mockpp_34\\InvocationMockerBuilder_test.obj 
-      c:\tmp\compile\mockpp_34\\InvokeAtLeastMatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\InvokeAtLeastOnceMatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\InvokeAtMostMatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\InvokeCountMatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\InvokedAfterMatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\InvokedBeforeMatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\InvokedRecorder_test.obj 
-      c:\tmp\compile\mockpp_34\\InvokeOnceMatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\IsAnything_test.obj 
-      c:\tmp\compile\mockpp_34\\IsCloseTo_test.obj 
-      c:\tmp\compile\mockpp_34\\IsEqual_test.obj 
-      c:\tmp\compile\mockpp_34\\IsGreaterOrEqual_test.obj 
-      c:\tmp\compile\mockpp_34\\IsGreaterThan_test.obj 
-      c:\tmp\compile\mockpp_34\\IsInstanceOf_test.obj 
-      c:\tmp\compile\mockpp_34\\IsLessOrEqual_test.obj 
-      c:\tmp\compile\mockpp_34\\IsLessThan_test.obj 
-      c:\tmp\compile\mockpp_34\\IsNot_test.obj 
-      c:\tmp\compile\mockpp_34\\IsNothing_test.obj 
-      c:\tmp\compile\mockpp_34\\IsSame_test.obj 
-      c:\tmp\compile\mockpp_34\\LIFOInvocationDispatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\MatchBuilder_test.obj 
-      c:\tmp\compile\mockpp_34\\mockpp_pti_test.obj 
-      c:\tmp\compile\mockpp_34\\NoArgumentsMatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\Or_test.obj 
-      c:\tmp\compile\mockpp_34\\OutBound_test.obj 
-      c:\tmp\compile\mockpp_34\\ReturnStub_test.obj 
-      c:\tmp\compile\mockpp_34\\StringContains_test.obj 
-      c:\tmp\compile\mockpp_34\\StringEndsWith_test.obj 
-      c:\tmp\compile\mockpp_34\\StringStartsWith_test.obj 
-      c:\tmp\compile\mockpp_34\\StubBuilder_test.obj 
-      c:\tmp\compile\mockpp_34\\StubSequence_test.obj 
-      c:\tmp\compile\mockpp_34\\TestFailureMatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\TestFailureStub_test.obj 
-      c:\tmp\compile\mockpp_34\\ThrowStub_test.obj 
-      c:\tmp\compile\mockpp_34\\TypelessStubSequence_test.obj 
-      c:\tmp\compile\mockpp_34\\UnlimitedMatcher_test.obj 
-      c:\tmp\compile\mockpp_34\\VerifyingTestCaller_test.obj 
-      c:\tmp\compile\mockpp_34\\VoidStub_test.obj"/>
+    <PROJECT value="c:\tmp\compile\mock_test_38.exe"/>
+    <OBJFILES value="c:\tmp\compile\mockpp_38\\AssertMo_test.obj 
+      c:\tmp\compile\mockpp_38\\ExpectationCounter_test.obj 
+      c:\tmp\compile\mockpp_38\\ExpectationCounterRange_test.obj 
+      c:\tmp\compile\mockpp_38\\ExpectationList_test.obj 
+      c:\tmp\compile\mockpp_38\\ExpectationMap_test.obj 
+      c:\tmp\compile\mockpp_38\\ExpectationSegment_test.obj 
+      c:\tmp\compile\mockpp_38\\ExpectationSet_test.obj 
+      c:\tmp\compile\mockpp_38\\ExpectationValue_test.obj 
+      c:\tmp\compile\mockpp_38\\Formatter_test.obj 
+      c:\tmp\compile\mockpp_38\\mock_test.obj 
+      c:\tmp\compile\mockpp_38\\VerifyingTestCase_test.obj 
+      c:\tmp\compile\mockpp_38\\Assert_test.obj 
+      c:\tmp\compile\mockpp_38\\MockObject_test.obj 
+      c:\tmp\compile\mockpp_38\\mockpp_test.obj 
+      c:\tmp\compile\mockpp_38\\ReturnObjectList_test.obj 
+      c:\tmp\compile\mockpp_38\\Verifiable_test.obj 
+      c:\tmp\compile\mockpp_38\\TrackingCounter_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_void_test.obj 
+      c:\tmp\compile\mockpp_38\\Exception_test.obj 
+      c:\tmp\compile\mockpp_38\\ExpectationBoundary_test.obj 
+      c:\tmp\compile\mockpp_38\\Throwable_test.obj 
+      c:\tmp\compile\mockpp_38\\ThrowableList_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_1_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_1_void_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_2_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_2_void_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_3_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_3_void_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_4_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_4_void_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_5_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_5_void_test.obj 
+      c:\tmp\compile\mockpp_38\\MixedMockObject_5_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_template_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockObject_test.obj 
+      c:\tmp\compile\mockpp_38\\ExpectationConglomeration_test.obj 
+      c:\tmp\compile\mockpp_38\\TimeServer_test.obj 
+      c:\tmp\compile\mockpp_38\\classes_ABCDE.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockMethod_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockMethod_1_test.obj 
+      c:\tmp\compile\mockpp_38\\VisitableMockMethod_2_test.obj 
+      c:\tmp\compile\mockpp_38\\ResponseVector_test.obj 
+      c:\tmp\compile\mockpp_38\\NoException_test.obj 
+      c:\tmp\compile\mockpp_38\\AbstractDynamicChainingMock_test.obj 
+      c:\tmp\compile\mockpp_38\\AbstractInvocationDispatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\And_test.obj 
+      c:\tmp\compile\mockpp_38\\AnyArgumentsMatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\ArgumentsMatchBuilder_test.obj 
+      c:\tmp\compile\mockpp_38\\ArgumentsMatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockMethod_1_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockMethod_2_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockMethod_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObject_1_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObject_1_void_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObject_2_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObject_2_void_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObject_3_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObject_3_void_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObject_4_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObject_4_void_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObject_5_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObject_5_void_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObject_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObject_void_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainableMockObjectPolymorphism_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainingMockBuilder_test.obj 
+      c:\tmp\compile\mockpp_38\\ChainingMockObjectSupport_test.obj 
+      c:\tmp\compile\mockpp_38\\ConstraintList_test.obj 
+      c:\tmp\compile\mockpp_38\\ConstraintSet_test.obj 
+      c:\tmp\compile\mockpp_38\\CoreMock_test.obj 
+      c:\tmp\compile\mockpp_38\\CustomStub_test.obj 
+      c:\tmp\compile\mockpp_38\\DefaultResultStub_test.obj 
+      c:\tmp\compile\mockpp_38\\DynamicChainingMockError_test.obj 
+      c:\tmp\compile\mockpp_38\\FIFOInvocationDispatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\Invocation_test.obj 
+      c:\tmp\compile\mockpp_38\\InvocationMocker_test.obj 
+      c:\tmp\compile\mockpp_38\\InvocationMockerBuilder_test.obj 
+      c:\tmp\compile\mockpp_38\\InvokeAtLeastMatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\InvokeAtLeastOnceMatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\InvokeAtMostMatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\InvokeCountMatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\InvokedAfterMatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\InvokedBeforeMatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\InvokedRecorder_test.obj 
+      c:\tmp\compile\mockpp_38\\InvokeOnceMatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\IsAnything_test.obj 
+      c:\tmp\compile\mockpp_38\\IsCloseTo_test.obj 
+      c:\tmp\compile\mockpp_38\\IsEqual_test.obj 
+      c:\tmp\compile\mockpp_38\\IsGreaterOrEqual_test.obj 
+      c:\tmp\compile\mockpp_38\\IsGreaterThan_test.obj 
+      c:\tmp\compile\mockpp_38\\IsInstanceOf_test.obj 
+      c:\tmp\compile\mockpp_38\\IsLessOrEqual_test.obj 
+      c:\tmp\compile\mockpp_38\\IsLessThan_test.obj 
+      c:\tmp\compile\mockpp_38\\IsNot_test.obj 
+      c:\tmp\compile\mockpp_38\\IsNothing_test.obj 
+      c:\tmp\compile\mockpp_38\\IsSame_test.obj 
+      c:\tmp\compile\mockpp_38\\LIFOInvocationDispatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\MatchBuilder_test.obj 
+      c:\tmp\compile\mockpp_38\\mockpp_pti_test.obj 
+      c:\tmp\compile\mockpp_38\\NoArgumentsMatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\Or_test.obj 
+      c:\tmp\compile\mockpp_38\\OutBound_test.obj 
+      c:\tmp\compile\mockpp_38\\ReturnStub_test.obj 
+      c:\tmp\compile\mockpp_38\\StringContains_test.obj 
+      c:\tmp\compile\mockpp_38\\StringEndsWith_test.obj 
+      c:\tmp\compile\mockpp_38\\StringStartsWith_test.obj 
+      c:\tmp\compile\mockpp_38\\StubBuilder_test.obj 
+      c:\tmp\compile\mockpp_38\\StubSequence_test.obj 
+      c:\tmp\compile\mockpp_38\\TestFailureMatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\TestFailureStub_test.obj 
+      c:\tmp\compile\mockpp_38\\ThrowStub_test.obj 
+      c:\tmp\compile\mockpp_38\\TypelessStubSequence_test.obj 
+      c:\tmp\compile\mockpp_38\\UnlimitedMatcher_test.obj 
+      c:\tmp\compile\mockpp_38\\VerifyingTestCaller_test.obj 
+      c:\tmp\compile\mockpp_38\\VoidStub_test.obj"/>
     <RESFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="c:\tmp\compile\mockpp_34.lib c:\tmp\compile\mockpp_production_34.lib 
-      c:\tmp\compile\mockpp_cxxtest_34.lib"/>
+    <LIBFILES value="c:\tmp\compile\mockpp_38.lib c:\tmp\compile\mockpp_production_38.lib 
+      c:\tmp\compile\mockpp_cxxtest_38.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
@@ -147,11 +147,11 @@
   </MACROS>
   <OPTIONS>
     <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/>
-    <PFLAGS value="-N2&quot;c:\tmp\compile\mockpp_34\&quot; -N0&quot;c:\tmp\compile\mockpp_34\&quot; -$YD -$W 
+    <PFLAGS value="-N2&quot;c:\tmp\compile\mockpp_38\&quot; -N0&quot;c:\tmp\compile\mockpp_38\&quot; -$YD -$W 
       -$O- -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-l&quot;c:\tmp\compile\&quot; -I&quot;c:\tmp\compile\mockpp_34\&quot; -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+    <LFLAGS value="-l&quot;c:\tmp\compile\&quot; -I&quot;c:\tmp\compile\mockpp_38\&quot; -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/>
@@ -207,39 +207,39 @@
 Item16=..\mockpp\tests;.\..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
 Item17=..\mockpp\tests;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
 Item18=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include
-Item19=..\mockpp\tests;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
-Item20=..\mockpp\tests;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
-Item21=..\mockpp\tests;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include
+Item19=..\mockpp\tests;..\mockpp_38\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
+Item20=..\mockpp\tests;..\mockpp_38\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
+Item21=..\mockpp\tests;..\mockpp_38\tests;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include
 Item22=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include
-Item23=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include
+Item23=..\tests;tests;\\SONNE\HOMES\Documents\src\mockpp_38\mockpp\mockpp_38\tests;\\SONNE\HOMES\src\mockpp_38\mockpp\mockpp_38\tests;..\mockpp_38\tests;..;$(BCB)\include;..\..\cppun...
 
[truncated message content]

[Mockpp-commits] mockpp/mockpp mockpp_config-bcb5.h,1.3,1.4 mockpp_config-msvc_71.h,1.3,1.4

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11869/mockpp

Modified Files:
	mockpp_config-bcb5.h mockpp_config-msvc_71.h 
Log Message:
added script to retrieve data from configure 

Index: mockpp_config-bcb5.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp_config-bcb5.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mockpp_config-bcb5.h	17 Jan 2006 19:04:28 -0000	1.3
+++ mockpp_config-bcb5.h	12 Mar 2006 08:25:55 -0000	1.4
@@ -1,6 +1,6 @@
 // #define's for Borland BCB5
 // derived from automatically generated config.h. See Makefile.am.
-/* Generated: 2006-01-17 */
+/* Generated: 2006-03-06 */
 
 #pragma warn -8030 // temporary variables
 
@@ -11,7 +11,7 @@
 #undef DEBUG
 
 /* Version number of package */
-#define MOCKPP_VERSION "1.11.2"
+#define MOCKPP_VERSION "1.11.3"
 
 /* Name of package */
 #define MOCKPP_PACKAGE "mockpp"

Index: mockpp_config-msvc_71.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp_config-msvc_71.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mockpp_config-msvc_71.h	17 Jan 2006 19:04:28 -0000	1.3
+++ mockpp_config-msvc_71.h	12 Mar 2006 08:25:55 -0000	1.4
@@ -1,6 +1,6 @@
 // #define's for MS Visual C++ 7.1 and later (NOT 6.0/7.0)
 // derived from automatically generated config.h. See Makefile.am.
-/* Generated: 2006-01-17 */
+/* Generated: 2006-03-06 */
 
 /* Define to use sprintf_s instead of sprintf. */
 #if _MSC_VER >= 1400
@@ -11,7 +11,7 @@
 #undef DEBUG
 
 /* Version number of package */
-#define MOCKPP_VERSION "1.11.2"
+#define MOCKPP_VERSION "1.11.3"
 
 /* Name of package */
 #define MOCKPP_PACKAGE "mockpp"

[Mockpp-commits] mockpp/mockpp/tests Formatter_test.cpp,1.41,1.42

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22078/mockpp/tests

Modified Files:
	Formatter_test.cpp 
Log Message:
fix for 64bit platforms

Index: Formatter_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Formatter_test.cpp	6 Mar 2006 19:21:34 -0000	1.41
+++ Formatter_test.cpp	6 Mar 2006 19:29:19 -0000	1.42
@@ -29,7 +29,7 @@
 
 #include <mockpp/mockpp.h> // always first
 #include <cstdio>
-#include <iostream>
+//#include <iostream>
 
 #include "SelectFramework.h"
 
@@ -323,7 +323,7 @@
 
   mockpp::String str = mockpp::number((unsigned long)123, 16);
   str = mockpp::number(ull, 16);
-  std::cout << mockpp::getLatin1(str).c_str() << std::endl;
+//  std::cout << mockpp::getLatin1(str).c_str() << std::endl;
   MOCKPP_ASSERT_EQUALS(MOCKPP_PCSTRING("-8000000000000000"), str); // differs from sprintf(..)
 }
 

[Mockpp-commits] mockpp configure.in,1.112,1.113

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22078

Modified Files:
	configure.in 
Log Message:
fix for 64bit platforms

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- configure.in	17 Jan 2006 19:04:28 -0000	1.112
+++ configure.in	6 Mar 2006 19:29:19 -0000	1.113
@@ -17,10 +17,10 @@
 #
 MOCKPP_MAJOR_VERSION=1
 MOCKPP_MINOR_VERSION=11
-MOCKPP_PATCH_VERSION=2
+MOCKPP_PATCH_VERSION=3
 
-MOCKPP_MICRO_VERSION=37
-MOCKPP_INTERFACE_AGE=3
+MOCKPP_MICRO_VERSION=38
+MOCKPP_INTERFACE_AGE=0
 MOCKPP_BINARY_AGE=3
 
 MOCKPP_VERSION=$MOCKPP_MAJOR_VERSION.$MOCKPP_MINOR_VERSION.$MOCKPP_PATCH_VERSION

[Mockpp-commits] mockpp/mockpp/compat Formatter.cpp,1.48,1.49 Formatter.h,1.38,1.39

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/compat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17949/mockpp/compat

Modified Files:
	Formatter.cpp Formatter.h 
Log Message:
fix for 64bit platforms

Index: Formatter.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Formatter.h	29 Dec 2005 19:29:50 -0000	1.38
+++ Formatter.h	6 Mar 2006 19:21:34 -0000	1.39
@@ -44,6 +44,14 @@
   */
   mockpp::String number(long n, unsigned base = 10);
 
+/** Converts a longlong value into its string representation.
+  * @ingroup grp_helper
+  * @param n          the actual value
+  * @param base       the conversion base from 2 to 36
+  * @return the resulting string
+  */
+  mockpp::String number(long long n, unsigned base = 10);
+
 
 /** Converts an unsigned long value into its string representation.
   * @ingroup grp_helper
@@ -54,6 +62,15 @@
   mockpp::String number(unsigned long n, unsigned base = 10);
 
 
+/** Converts an unsigned long value into its string representation.
+  * @ingroup grp_helper
+  * @param n          the actual value
+  * @param base       the conversion base from 2 to 36
+  * @return the resulting string
+  */
+  mockpp::String number(unsigned long long n, unsigned base = 10);
+
+
 /** Converts an double value into its string representation.
   * @ingroup grp_helper
   * @param n          the actual value

Index: Formatter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Formatter.cpp	29 Dec 2005 19:29:50 -0000	1.48
+++ Formatter.cpp	6 Mar 2006 19:21:34 -0000	1.49
@@ -1,5 +1,5 @@
 /** @file
-   @brief    support formatting of strings
+    @brief    support formatting of strings
 
  $Id$
 
@@ -44,18 +44,21 @@
 #undef MOCKPP_ENABLE_DEFAULT_FORMATTER // one never knows..
 
 
-mockpp::String MOCKPP_EXPORT number( long n, unsigned base )
+namespace {
+
+template <typename T, typename uT>
+mockpp::String MOCKPP_EXPORT number_stpl( T n, unsigned base )
 {
   if ( base < 2 || base > 36 )
   {
-    mockpp::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of long to String: base %1 not allowed" ) );
-    fmt << number( ( unsigned long ) base, 10 );
+    mockpp::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of T to String: base %1 not allowed" ) );
+    fmt << number( ( uT ) base, 10 );
     mockpp::assertionFailed( __LINE__, __FILE__, fmt );
   }
 
-  mockpp::Char charbuf[ 65 * sizeof( mockpp::Char ) ];
+  mockpp::Char charbuf[ sizeof(T) * 65 * sizeof( mockpp::Char ) ];
   mockpp::Char *buf = ( mockpp::Char* ) charbuf;
-  mockpp::Char *p = &buf[ 64 ];
+  mockpp::Char *p = &buf[ sizeof(T) * 64 ];
   *p = MOCKPP_CHAR( '\0' );
   int len = 0;
   bool neg;
@@ -63,17 +66,17 @@
   {
     neg = true;
 #ifdef HAVE_LIMITS
-    if ( n == std::numeric_limits<long>::min() )
+    if ( n == std::numeric_limits<T>::min() )
 #else
     if ( n == INT_MIN )
 #endif
     {
       mockpp::String s1, s2;
-      s1 = number( n / ( long ) base, base );
+      s1 = number( n / ( T ) base, base );
 #if defined(_MSC_VER) && (_MSC_VER <= 1200)
-      s2 = number( ( unsigned long ) ( -( n + ( long ) base ) ) % base, base );
+      s2 = number( ( unsigned T ) ( -( n + ( T ) base ) ) % base, base );
 #else
-      s2 = number( ( -( n + ( long ) base ) ) % base, base );
+      s2 = number( ( -( n + ( T ) base ) ) % base, base );
 #endif
       return s1 + s2;
     }
@@ -100,19 +103,36 @@
   return p;
 }
 
+} // anon ns
+
+
+mockpp::String MOCKPP_EXPORT number( long n, unsigned base )
+{
+  return number_stpl<long, unsigned long>(n, base);
+}
+
 
-mockpp::String MOCKPP_EXPORT number( unsigned long n, unsigned base )
+mockpp::String MOCKPP_EXPORT number( long long n, unsigned base )
+{
+  return number_stpl<long long, unsigned long long>(n, base);
+}
+
+
+namespace {
+
+template <typename T>
+mockpp::String MOCKPP_EXPORT number_utpl(T n, unsigned base )
 {
   if ( base < 2 || base > 36 )
   {
-    mockpp::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of ulong to String: base %1 not allowed" ) );
-    fmt << number( ( unsigned long ) base, 10 );
+    mockpp::String fmt = mockpp_i18n( MOCKPP_PCHAR( "Conversion of unsigned T to String: base %1 not allowed" ) );
+    fmt << number( ( T ) base, 10 );
     mockpp::assertionFailed( __LINE__, __FILE__, fmt );
   }
 
-  mockpp::Char charbuf[ 65 * sizeof( mockpp::Char ) ];
+  mockpp::Char charbuf[ sizeof(T) * 65 * sizeof( mockpp::Char ) ];
   mockpp::Char *buf = ( mockpp::Char* ) charbuf;
-  mockpp::Char *p = &buf[ 64 ];
+  mockpp::Char *p = &buf[ sizeof(T) * 64 ];
   int len = 0;
   *p = MOCKPP_CHAR( '\0' );
   do
@@ -126,6 +146,20 @@
   return p;
 }
 
+} // anon ns
+
+
+mockpp::String MOCKPP_EXPORT number( unsigned long n, unsigned base )
+{
+  return number_utpl<unsigned long>(n, base);
+}
+
+
+mockpp::String MOCKPP_EXPORT number( unsigned long long n, unsigned base )
+{
+  return number_utpl<unsigned long long>(n, base);
+}
+
 
 mockpp::String MOCKPP_EXPORT number( double n, unsigned prec )
 {

[Mockpp-commits] mockpp/mockpp/tests Formatter_test.cpp,1.40,1.41

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17949/mockpp/tests

Modified Files:
	Formatter_test.cpp 
Log Message:
fix for 64bit platforms

Index: Formatter_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- Formatter_test.cpp	6 Jan 2006 16:02:34 -0000	1.40
+++ Formatter_test.cpp	6 Mar 2006 19:21:34 -0000	1.41
@@ -29,6 +29,7 @@
 
 #include <mockpp/mockpp.h> // always first
 #include <cstdio>
+#include <iostream>
 
 #include "SelectFramework.h"
 
@@ -292,7 +293,9 @@
   long ul = INT_MIN;
 #endif
 
-  mockpp::String str = mockpp::number(ul);  // base 10
+  mockpp::String str = mockpp::number((long)123, 16);
+
+  str = mockpp::number(ul);  // base 10
   char buff[100];
 #ifdef HAVE_SPRINTF_S
   sprintf_s(buff, "%ld", ul );
@@ -313,30 +316,32 @@
 void Formatter_test::test_number_min_long_hex()
 {
 #ifdef HAVE_LIMITS
-  long ul = std::numeric_limits<long>::min();
+  long long ull = std::numeric_limits<long long>::min();
 #else
-  long ul = INT_MIN;
+  long long ull = INT_MIN;
 #endif
 
-  mockpp::String str = mockpp::number(ul, 16);
-  MOCKPP_ASSERT_EQUALS(MOCKPP_PCSTRING("-80000000"), str); // differs from sprintf(..)
+  mockpp::String str = mockpp::number((unsigned long)123, 16);
+  str = mockpp::number(ull, 16);
+  std::cout << mockpp::getLatin1(str).c_str() << std::endl;
+  MOCKPP_ASSERT_EQUALS(MOCKPP_PCSTRING("-8000000000000000"), str); // differs from sprintf(..)
 }
 
 
 void Formatter_test::test_number_max_long_dec()
 {
 #ifdef HAVE_LIMITS
-  long ul = std::numeric_limits<long>::max();
+  long long ul = std::numeric_limits<long long>::max();
 #else
-  long ul = INT_MAX;
+  long long ul = INT_MAX;
 #endif
 
   mockpp::String str = mockpp::number(ul);  // base 10
   char buff[100];
 #ifdef HAVE_SPRINTF_S
-  sprintf_s(buff, "%ld", ul );
+  sprintf_s(buff, "%lld", ul );
 #else
-  std::sprintf(buff, "%ld", ul );
+  std::sprintf(buff, "%lld", ul );
 #endif
 
 #ifdef MOCKPP_UNICODE
@@ -352,17 +357,17 @@
 void Formatter_test::test_number_max_ulong_dec()
 {
 #ifdef HAVE_LIMITS
-  unsigned long ul = std::numeric_limits<unsigned long>::max();
+  unsigned long long ul = std::numeric_limits<unsigned long long>::max();
 #else
-  unsigned long ul = UINT_MAX;
+  unsigned long long ul = UINT_MAX;
 #endif
 
   mockpp::String str = mockpp::number(ul);  // base 10
   char buff[100];
 #ifdef HAVE_SPRINTF_S
-  sprintf_s(buff, "%lu", ul );
+  sprintf_s(buff, "%llu", ul );
 #else
-  std::sprintf(buff, "%lu", ul );
+  std::sprintf(buff, "%llu", ul );
 #endif
 
 #ifdef MOCKPP_UNICODE

[Mockpp-commits] mockpp/mockpp mockpp.cpp,1.24,1.25

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3748/mockpp

Modified Files:
	mockpp.cpp 
Log Message:
fix for 64bit platforms

Index: mockpp.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- mockpp.cpp	29 Dec 2005 19:29:50 -0000	1.24
+++ mockpp.cpp	6 Mar 2006 18:05:57 -0000	1.25
@@ -41,7 +41,7 @@
   MOCKPP_STL::string num;
   info = "";
 
-  unsigned pos = s.find('.');
+  std::size_t pos = s.find('.');
   bool good = true;
   if (pos != MOCKPP_STL::string::npos)
   {
@@ -54,7 +54,7 @@
     major = std::atoi(num.c_str());
 #endif
     s.erase(0, pos+1);
-    unsigned pos = s.find('.');
+    std::size_t pos = s.find('.');
 
     if (pos != MOCKPP_STL::string::npos)
     {

[Mockpp-commits] mockpp ChangeLog,1.98,1.99

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3748

Modified Files:
	ChangeLog 
Log Message:
fix for 64bit platforms

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- ChangeLog	4 Feb 2006 14:50:38 -0000	1.98
+++ ChangeLog	6 Mar 2006 18:05:56 -0000	1.99
@@ -2,6 +2,10 @@
 
                             mockpp history
                             --------------
+2006-03-05  1.11.3
+
+ - fix for potential 64bit problem
+
 2006-02-04  1.11.2
 
  - add batchfile install-win.bat to install the headers