mockpp-commits

[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