Update of /cvsroot/mockpp/mockpp/mockpp/chaining
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19191/mockpp/chaining
Modified Files:
ChainableMockMethod0.h ChainableMockMethod1.h
ChainableMockMethod2.h ChainableMockMethod3.h
ChainableMockMethod4.h ChainableMockMethod5.h
ChainableMockMethod6.h ChainableMockObject_macro.h
ChainingMockBuilder.h gen_chainablemethod_N.pl
Log Message:
fix endless recursion
Index: ChainingMockBuilder.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockBuilder.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ChainingMockBuilder.h 29 Dec 2005 19:29:50 -0000 1.27
+++ ChainingMockBuilder.h 6 Jan 2006 20:53:51 -0000 1.28
@@ -65,8 +65,8 @@
ChainingMockBuilder( DynamicChainingMock<R, I> *in_coreMock,
BuilderNamespace *in_buildernamespace,
- const String &name, VerifiableList *parent = 0 )
- : DynamicChainingMock<R, I>(name, parent)
+ const String &name /*, VerifiableList *parent = 0*/ )
+ : DynamicChainingMock<R, I>(name /*, parent*/)
, coreMock( in_coreMock )
, buildernamespace(in_buildernamespace)
{}
Index: ChainableMockObject_macro.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject_macro.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChainableMockObject_macro.h 29 Dec 2005 19:29:50 -0000 1.15
+++ ChainableMockObject_macro.h 6 Jan 2006 20:53:51 -0000 1.16
@@ -54,7 +54,7 @@
public: \
\
ChainerFor ## methname(classname *cls) \
- : mockpp::ChainingMockBuilder<mockpp::ArgumentsMatchBuilder ## ArgCount< ReturnType, InvocationType > >(&cls->methname ## CoreMock, cls, MOCKPP_PCHAR("ChainerFor") MOCKPP_PCHAR(# methname), cls) \
+ : mockpp::ChainingMockBuilder<mockpp::ArgumentsMatchBuilder ## ArgCount< ReturnType, InvocationType > >(&cls->methname ## CoreMock, cls, MOCKPP_PCHAR("ChainerFor") MOCKPP_PCHAR(# methname)) \
{ \
} \
\
Index: gen_chainablemethod_N.pl
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/gen_chainablemethod_N.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gen_chainablemethod_N.pl 29 Dec 2005 19:29:50 -0000 1.9
+++ gen_chainablemethod_N.pl 6 Jan 2006 20:53:51 -0000 1.10
@@ -54,7 +54,7 @@
#include <mockpp/mockpp.h>
-#include <mockpp/ChainableMockObject.h>
+#include <mockpp/chaining/ChainableMockObject.h>
#include <mockpp/chaining/ChainableMockMethod.h>
|
