mockpp-commits Mailing List for Mock Objects for C++ (Page 32)
Brought to you by:
ewald-arnold
Menu
▾
▴
mockpp-commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(17) |
Mar
(178) |
Apr
(119) |
May
(60) |
Jun
(3) |
Jul
(60) |
Aug
(16) |
Sep
(55) |
Oct
(156) |
Nov
(136) |
Dec
(255) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(98) |
Feb
(8) |
Mar
(57) |
Apr
(43) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:40:08
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23856/mockpp Modified Files: Makefile.am Log Message: append default includes Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- Makefile.am 17 Sep 2005 08:13:53 -0000 1.85 +++ Makefile.am 19 Sep 2005 18:39:58 -0000 1.86 @@ -1,4 +1,4 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) SUBDIRS = chaining compat util builder constraint matcher stub production . docs tests po \ @@ -15,7 +15,8 @@ $(top_builddir)/mockpp/util/libutil.la $(top_builddir)/mockpp/stub/libstub.la \ $(top_builddir)/mockpp/matcher/libmatcher.la $(top_builddir)/mockpp/constraint/libconstraint.la \ $(top_builddir)/mockpp/compat/libcompat.la $(top_builddir)/mockpp/chaining/libchaining.la \ - $(top_builddir)/mockpp/builder/libbuilder.la + $(top_builddir)/mockpp/builder/libbuilder.la \ + $(EA_EXTRA_LIB) $(LIBCPPUNIT) libmockpp_la_SOURCES = ExpectationCounter.cpp mockpp.cpp Throwable.cpp \ ThrowableList.cpp MockObject.cpp VisitableMockObject.cpp VerifiableList.cpp \ |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:40:05
|
Update of /cvsroot/mockpp/mockpp/mockpp/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23856/mockpp/util Modified Files: Makefile.am Log Message: append default includes Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 17 Sep 2005 08:13:54 -0000 1.8 +++ Makefile.am 19 Sep 2005 18:39:58 -0000 1.9 @@ -1,4 +1,4 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) noinst_LTLIBRARIES = libutil.la |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:36:40
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22812/mockpp/tests Modified Files: Makefile.am Log Message: append default includes Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- Makefile.am 17 Sep 2005 08:13:54 -0000 1.78 +++ Makefile.am 19 Sep 2005 18:36:28 -0000 1.79 @@ -1,17 +1,17 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) CLEANFILES = *.~* *.~~* *~ ########################################################################### -AM_LDFLAGS = $(all_libraries) +AM_LDFLAGS = $(all_libraries) check_PROGRAMS = jmock_test mock_test readability_test check_inst -SINGLE_TESTS = $(check_PROGRAMS) +SINGLE_TESTS = $(check_PROGRAMS) -TESTS = $(SINGLE_TESTS) +TESTS = $(SINGLE_TESTS) .PHONY: check_inst.cpp |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:36:40
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22812/mockpp/stub Modified Files: Makefile.am Log Message: append default includes Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 17 Sep 2005 08:13:54 -0000 1.8 +++ Makefile.am 19 Sep 2005 18:36:28 -0000 1.9 @@ -1,4 +1,4 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) noinst_LTLIBRARIES = libstub.la |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:36:36
|
Update of /cvsroot/mockpp/mockpp/mockpp/production In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22812/mockpp/production Modified Files: Makefile.am Log Message: append default includes Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.am 17 Sep 2005 08:13:54 -0000 1.4 +++ Makefile.am 19 Sep 2005 18:36:28 -0000 1.5 @@ -1,4 +1,4 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) lib_LTLIBRARIES = libmockpp_production.la |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:36:36
|
Update of /cvsroot/mockpp/mockpp/mockpp/matcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22812/mockpp/matcher Modified Files: Makefile.am Log Message: append default includes Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Makefile.am 17 Sep 2005 08:13:54 -0000 1.14 +++ Makefile.am 19 Sep 2005 18:36:28 -0000 1.15 @@ -1,4 +1,4 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) noinst_LTLIBRARIES = libmatcher.la |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:36:36
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22812/mockpp/examples Modified Files: Makefile.am Log Message: append default includes Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Makefile.am 17 Sep 2005 08:13:53 -0000 1.14 +++ Makefile.am 19 Sep 2005 18:36:28 -0000 1.15 @@ -1,8 +1,8 @@ -SUBDIRS= tutorial - -INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) +SUBDIRS= tutorial + noinst_PROGRAMS = mock_greeter all: $(bin_PROGRAMS) |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:36:36
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22812/mockpp/examples/tutorial Modified Files: Makefile.am Log Message: append default includes Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/Makefile.am,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Makefile.am 17 Sep 2005 08:13:53 -0000 1.24 +++ Makefile.am 19 Sep 2005 18:36:28 -0000 1.25 @@ -1,4 +1,4 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) LDADD = ../../libmockpp.la $(EA_EXTRA_LIB) $(LIBCPPUNIT) $(LIBDL) -lstdc++ |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:35:13
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22305/mockpp/compat Modified Files: Makefile.am Log Message: append default includes Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile.am 17 Sep 2005 08:13:53 -0000 1.10 +++ Makefile.am 19 Sep 2005 18:34:35 -0000 1.11 @@ -1,4 +1,4 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) noinst_LTLIBRARIES = libcompat.la |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:35:13
|
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22305/mockpp/constraint Modified Files: Makefile.am Log Message: append default includes Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 17 Sep 2005 08:13:53 -0000 1.11 +++ Makefile.am 19 Sep 2005 18:34:35 -0000 1.12 @@ -1,4 +1,4 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) noinst_LTLIBRARIES = libconstraint.la |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:35:12
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22305/mockpp/chaining Modified Files: Makefile.am Log Message: append default includes Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile.am 17 Sep 2005 08:13:53 -0000 1.10 +++ Makefile.am 19 Sep 2005 18:34:35 -0000 1.11 @@ -1,4 +1,4 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) noinst_LTLIBRARIES = libchaining.la |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:35:11
|
Update of /cvsroot/mockpp/mockpp/mockpp/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22305/mockpp/builder Modified Files: Makefile.am Log Message: append default includes Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 17 Sep 2005 08:13:53 -0000 1.8 +++ Makefile.am 19 Sep 2005 18:34:35 -0000 1.9 @@ -1,4 +1,4 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) libbuilderinclude_HEADERS = ArgumentsMatchBuilder.h BuilderNamespace.h IdentityBuilder.h InvocationMockerBuilder.h MatchBuilder.h StubBuilder.h |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:33:49
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21952/mockpp Modified Files: VisitableMockObject_macro.h Log Message: add spaces to enable templates as macros Index: VisitableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_macro.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- VisitableMockObject_macro.h 31 Jul 2005 14:22:57 -0000 1.31 +++ VisitableMockObject_macro.h 19 Sep 2005 18:33:40 -0000 1.32 @@ -286,7 +286,7 @@ objptr->methname ## ResponseValues.add(rv, (type1&)p1, count); \ } \ \ - void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder< type1 > &p1, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, p1, count); \ @@ -299,8 +299,8 @@ objptr->methname ## ResponseValues.add(rv, (type1&)p1, (type2&)p2, count); \ } \ \ - void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, p1, p2, count); \ @@ -313,9 +313,9 @@ objptr->methname ## ResponseValues.add(rv, (type1&)p1, (type2&)p2, (type3&)p3, count); \ } \ \ - void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, \ - const mockpp::ConstraintHolder<type3> &p3, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, \ + const mockpp::ConstraintHolder< type3 > &p3, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, p1, p2, p3, count); \ @@ -328,10 +328,10 @@ objptr->methname ## ResponseValues.add(rv, (type1 &)p1, (type2 &)p2, (type3 &)p3, (type4 &)p4, count); \ } \ \ - void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, \ - const mockpp::ConstraintHolder<type3> &p3, \ - const mockpp::ConstraintHolder<type4> &p4, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, \ + const mockpp::ConstraintHolder< type3 > &p3, \ + const mockpp::ConstraintHolder< type4 > &p4, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, p1, p2, p3, p4, count); \ @@ -344,11 +344,11 @@ objptr->methname ## ResponseValues.add(rv, (type1)p1, (type2)p2, (type3)p3, (type4)p4, (type5)p5, count); \ } \ \ - void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, \ - const mockpp::ConstraintHolder<type3> &p3, \ - const mockpp::ConstraintHolder<type4> &p4, \ - const mockpp::ConstraintHolder<type5> &p5, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, \ + const mockpp::ConstraintHolder< type3 > &p3, \ + const mockpp::ConstraintHolder< type4 > &p4, \ + const mockpp::ConstraintHolder< type5 > &p5, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, p1, p2, p3, p4, p5, count); \ @@ -365,7 +365,7 @@ objptr->methname ## ResponseValues.add(t, (type1&)p1, count); \ } \ \ - void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder< type1 > &p1, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, count); \ @@ -378,8 +378,8 @@ objptr->methname ## ResponseValues.add(t, (type1&)p1, (type2&)p2, count); \ } \ \ - void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, p2, count); \ @@ -392,9 +392,9 @@ objptr->methname ## ResponseValues.add(t, (type1 &)p1, (type2&)p2, (type3&)p3, count); \ } \ \ - void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, \ - const mockpp::ConstraintHolder<type3> &p3, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, \ + const mockpp::ConstraintHolder< type3 > &p3, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, p2, p3, count); \ @@ -407,10 +407,10 @@ objptr->methname ## ResponseValues.add(t, (type1 &)p1, (type2 &)p2, (type3 &)p3, (type4 &)p4, count); \ } \ \ - void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, \ - const mockpp::ConstraintHolder<type3> &p3, \ - const mockpp::ConstraintHolder<type4> &p4, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, \ + const mockpp::ConstraintHolder< type3 > &p3, \ + const mockpp::ConstraintHolder< type4 > &p4, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, p2, p3, p4, count); \ @@ -423,11 +423,11 @@ objptr->methname ## ResponseValues.add(t, (type1)p1, (type2)p2, (type3)p3, (type4)p4, (type5)p5, count); \ } \ \ - void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, \ - const mockpp::ConstraintHolder<type3> &p3, \ - const mockpp::ConstraintHolder<type4> &p4, \ - const mockpp::ConstraintHolder<type5> &p5, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, \ + const mockpp::ConstraintHolder< type3 > &p3, \ + const mockpp::ConstraintHolder< type4 > &p4, \ + const mockpp::ConstraintHolder< type5 > &p5, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, p2, p3, p4, p5, count); \ @@ -591,33 +591,33 @@ mutable std::vector<bool> name ## ThrowableInsteadReturn #define MOCKPP_DECLARE_RETURN_VARS(ret_type, name) \ - mutable mockpp::ReturnObjectList<ret_type> name ## ReturnValues; \ - bool name ## haveDefaultReturnValue; \ - mutable bool name ## DefaultReturnValueUsed; \ - ret_type name ## DefaultReturnValue + mutable mockpp::ReturnObjectList< ret_type > name ## ReturnValues; \ + bool name ## haveDefaultReturnValue; \ + mutable bool name ## DefaultReturnValueUsed; \ + ret_type name ## DefaultReturnValue //////////////////////////////////////////////////////////////////////////// // #define MOCKPP_DECLARE_PARAMETER_VARS1(name, type1) \ - mutable mockpp::ConstraintList<type1> name ## Parameter1 + mutable mockpp::ConstraintList< type1 > name ## Parameter1 #define MOCKPP_DECLARE_PARAMETER_VARS2(name, type1, type2) \ MOCKPP_DECLARE_PARAMETER_VARS1(name, type1); \ - mutable mockpp::ConstraintList<type2> name ## Parameter2 + mutable mockpp::ConstraintList< type2 > name ## Parameter2 #define MOCKPP_DECLARE_PARAMETER_VARS3(name, type1, type2, type3) \ MOCKPP_DECLARE_PARAMETER_VARS2(name, type1, type2); \ - mutable mockpp::ConstraintList<type3> name ## Parameter3 + mutable mockpp::ConstraintList< type3 > name ## Parameter3 #define MOCKPP_DECLARE_PARAMETER_VARS4(name, type1, type2, type3, type4) \ MOCKPP_DECLARE_PARAMETER_VARS3(name, type1, type2, type3); \ - mutable mockpp::ConstraintList<type4> name ## Parameter4 + mutable mockpp::ConstraintList< type4 > name ## Parameter4 #define MOCKPP_DECLARE_PARAMETER_VARS5(name, type1, type2, type3, type4, type5) \ MOCKPP_DECLARE_PARAMETER_VARS4(name, type1, type2, type3, type4); \ - mutable mockpp::ConstraintList<type5> name ## Parameter5 + mutable mockpp::ConstraintList< type5 > name ## Parameter5 //////////////////////////////////////////////////////////////////////////// // @@ -742,14 +742,14 @@ } \ } \ \ - void a_name (const mockpp::ConstraintHolder<v_type1> ¶m1) /* @todo const? */ \ + void a_name (const mockpp::ConstraintHolder< v_type1 > ¶m1) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ - mutable mockpp::ResponseThrowableVector1<v_type1> m_name ## ResponseValues; \ + mutable mockpp::ResponseThrowableVector1< v_type1 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS1(m_name, v_type1); \ MOCKPP_VOID_CONTROLLER_DECL1(classname, m_name, v_type1) @@ -795,8 +795,8 @@ } \ } \ \ - void a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2) /* @todo const? */ \ + void a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -804,7 +804,7 @@ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ - mutable mockpp::ResponseThrowableVector2<v_type1, v_type2> m_name ## ResponseValues; \ + mutable mockpp::ResponseThrowableVector2< v_type1, v_type2 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS2(m_name, v_type1, v_type2); \ MOCKPP_VOID_CONTROLLER_DECL2(classname, m_name, v_type1, v_type2) @@ -855,9 +855,9 @@ } \ } \ \ - void a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2, \ - const mockpp::ConstraintHolder<v_type3> ¶m3) /* @todo const? */ \ + void a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2, \ + const mockpp::ConstraintHolder< v_type3 > ¶m3) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -866,7 +866,7 @@ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ - mutable mockpp::ResponseThrowableVector3<v_type1, v_type2, v_type3> m_name ## ResponseValues; \ + mutable mockpp::ResponseThrowableVector3< v_type1, v_type2, v_type3 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS3(m_name, v_type1, v_type2, v_type3); \ MOCKPP_VOID_CONTROLLER_DECL3(classname, m_name, v_type1, v_type2, v_type3) @@ -922,10 +922,10 @@ } \ } \ \ - void a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2, \ - const mockpp::ConstraintHolder<v_type3> ¶m3, \ - const mockpp::ConstraintHolder<v_type4> ¶m4) /* @todo const? */ \ + void a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2, \ + const mockpp::ConstraintHolder< v_type3 > ¶m3, \ + const mockpp::ConstraintHolder< v_type4 > ¶m4) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -935,7 +935,7 @@ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ - mutable mockpp::ResponseThrowableVector4<v_type1, v_type2, v_type3, v_type4> m_name ## ResponseValues; \ + mutable mockpp::ResponseThrowableVector4< v_type1, v_type2, v_type3, v_type4 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS4(m_name, v_type1, v_type2, v_type3, v_type4); \ MOCKPP_VOID_CONTROLLER_DECL4(classname, m_name, v_type1, v_type2, v_type3, v_type4) @@ -996,11 +996,11 @@ } \ } \ \ - void a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2, \ - const mockpp::ConstraintHolder<v_type3> ¶m3, \ - const mockpp::ConstraintHolder<v_type4> ¶m4, \ - const mockpp::ConstraintHolder<v_type5> ¶m5) /* @todo const? */ \ + void a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2, \ + const mockpp::ConstraintHolder< v_type3 > ¶m3, \ + const mockpp::ConstraintHolder< v_type4 > ¶m4, \ + const mockpp::ConstraintHolder< v_type5 > ¶m5) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -1011,7 +1011,7 @@ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ - mutable mockpp::ResponseThrowableVector5<v_type1, v_type2, v_type3, v_type4, v_type5> m_name ## ResponseValues; \ + mutable mockpp::ResponseThrowableVector5< v_type1, v_type2, v_type3, v_type4, v_type5 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS5(m_name, v_type1, v_type2, v_type3, v_type4, v_type5); \ MOCKPP_VOID_CONTROLLER_DECL5(classname, m_name, v_type1, v_type2, v_type3, v_type4, v_type5) @@ -1100,7 +1100,7 @@ } \ } \ \ - m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1) /* @todo const? */ \ + m_ret_type a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -1109,7 +1109,7 @@ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ MOCKPP_DECLARE_RETURN_VARS(v_ret_type, m_name); \ - mutable mockpp::ResponseVector1<v_ret_type, v_type1> m_name ## ResponseValues; \ + mutable mockpp::ResponseVector1< v_ret_type, v_type1 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS1(m_name, v_type1); \ MOCKPP_CONTROLLER_DECL1(classname, v_ret_type, m_name, v_type1) @@ -1166,8 +1166,8 @@ } \ } \ \ - m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2) /* @todo const? */ \ + m_ret_type a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -1177,7 +1177,7 @@ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ MOCKPP_DECLARE_RETURN_VARS(v_ret_type, m_name); \ - mutable mockpp::ResponseVector2<v_ret_type, v_type1, v_type2> m_name ## ResponseValues; \ + mutable mockpp::ResponseVector2< v_ret_type, v_type1, v_type2 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS2(m_name, v_type1, v_type2); \ MOCKPP_CONTROLLER_DECL2(classname, v_ret_type, m_name, v_type1, v_type2) @@ -1239,9 +1239,9 @@ } \ } \ \ - m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2, \ - const mockpp::ConstraintHolder<v_type3> ¶m3) /* @todo const? */ \ + m_ret_type a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2, \ + const mockpp::ConstraintHolder< v_type3 > ¶m3) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -1252,7 +1252,7 @@ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ MOCKPP_DECLARE_RETURN_VARS(v_ret_type, m_name); \ - mutable mockpp::ResponseVector3<v_ret_type, v_type1, v_type2, v_type3> m_name ## ResponseValues; \ + mutable mockpp::ResponseVector3< v_ret_type, v_type1, v_type2, v_type3 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS3(m_name, v_type1, v_type2, v_type3); \ MOCKPP_CONTROLLER_DECL3(classname, v_ret_type, m_name, v_type1, v_type2, v_type3) @@ -1318,10 +1318,10 @@ } \ } \ \ - m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2, \ - const mockpp::ConstraintHolder<v_type3> ¶m3, \ - const mockpp::ConstraintHolder<v_type4> ¶m4) /* @todo const? */ \ + m_ret_type a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2, \ + const mockpp::ConstraintHolder< v_type3 > ¶m3, \ + const mockpp::ConstraintHolder< v_type4 > ¶m4) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -1333,7 +1333,7 @@ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ MOCKPP_DECLARE_RETURN_VARS(v_ret_type, m_name); \ - mutable mockpp::ResponseVector4<v_ret_type, v_type1, v_type2, v_type3, v_type4> m_name ## ResponseValues; \ + mutable mockpp::ResponseVector4< v_ret_type, v_type1, v_type2, v_type3, v_type4 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS4(m_name, v_type1, v_type2, v_type3, v_type4); \ MOCKPP_CONTROLLER_DECL4(classname, v_ret_type, m_name, v_type1, v_type2, v_type3, v_type4) @@ -1404,11 +1404,11 @@ } \ } \ \ - m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2, \ - const mockpp::ConstraintHolder<v_type3> ¶m3, \ - const mockpp::ConstraintHolder<v_type4> ¶m4, \ - const mockpp::ConstraintHolder<v_type5> ¶m5) /* @todo const? */ \ + m_ret_type a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2, \ + const mockpp::ConstraintHolder< v_type3 > ¶m3, \ + const mockpp::ConstraintHolder< v_type4 > ¶m4, \ + const mockpp::ConstraintHolder< v_type5 > ¶m5) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -1421,7 +1421,7 @@ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ MOCKPP_DECLARE_RETURN_VARS(v_ret_type, m_name); \ - mutable mockpp::ResponseVector5<v_ret_type, v_type1, v_type2, v_type3, v_type4, v_type5> m_name ## ResponseValues; \ + mutable mockpp::ResponseVector5< v_ret_type, v_type1, v_type2, v_type3, v_type4, v_type5 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS5(m_name, v_type1, v_type2, v_type3, v_type4, v_type5); \ MOCKPP_CONTROLLER_DECL5(classname, v_ret_type, m_name, v_type1, v_type2, v_type3, v_type4, v_type5) |
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:33:48
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21952/mockpp/chaining Modified Files: ChainableMockObject_macro.h Log Message: add spaces to enable templates as macros Index: ChainableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject_macro.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChainableMockObject_macro.h 24 Jul 2005 12:54:00 -0000 1.12 +++ ChainableMockObject_macro.h 19 Sep 2005 18:33:40 -0000 1.13 @@ -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::ChainingMockBuilder<mockpp::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), cls) \ + : mockpp::ChainingMockBuilder<mockpp::ArgumentsMatchBuilder ## ArgCount< ReturnType, InvocationType > >(&cls->methname ## CoreMock, cls, MOCKPP_PCHAR("ChainerFor") MOCKPP_PCHAR(# methname), cls) \ { \ } \ \ @@ -106,7 +106,7 @@ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ typedef mockpp::Invocation0 m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType> m_name ## CoreMock; \ + mutable mockpp::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) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ + mockpp::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::Invocation1< v_type1 > m_name ## InvocationType; \ + mutable mockpp::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) \ { \ std::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::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::Invocation2< v_type1, v_type2 > m_name ## InvocationType; \ + mutable mockpp::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) \ { \ std::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::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::Invocation3< v_type1, v_type2, v_type3 > m_name ## InvocationType; \ + mutable mockpp::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) \ { \ std::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::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::Invocation4< v_type1, v_type2, v_type3, v_type4 > m_name ## InvocationType; \ + mutable mockpp::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) \ { \ std::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::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::Invocation5< v_type1, v_type2, v_type3, v_type4, v_type5 > m_name ## InvocationType; \ + mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL5(classname, m_name, void, m_name ## InvocationType) //////////////////////////////////////////////////////////////////////////// @@ -245,7 +245,7 @@ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ typedef mockpp::Invocation0 m_name ## InvocationType; \ - mutable mockpp::CoreMock<m_ret_type, m_name ## InvocationType> m_name ## CoreMock; \ + mutable mockpp::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) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ + mockpp::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::Invocation1< v_type1 > m_name ## InvocationType; \ + mutable mockpp::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) \ { \ std::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::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::Invocation2< v_type1, v_type2 > m_name ## InvocationType; \ + mutable mockpp::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) \ { \ std::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::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::Invocation3< v_type1, v_type2, v_type3 > m_name ## InvocationType; \ + mutable mockpp::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) \ { \ std::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::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::Invocation4< v_type1, v_type2, v_type3, v_type4 > m_name ## InvocationType; \ + mutable mockpp::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) \ { \ std::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::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::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; \ MOCKPP_CHAINER_DECL5(classname, m_name, m_ret_type, m_name ## InvocationType) |
|
From: Ewald A. <ewa...@us...> - 2005-09-17 15:18:18
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21048 Modified Files: ChangeLog Log Message: next release Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- ChangeLog 3 Sep 2005 09:44:41 -0000 1.61 +++ ChangeLog 17 Sep 2005 15:18:09 -0000 1.62 @@ -2,6 +2,10 @@ mockpp history -------------- +2005-09-17 1.9.3: + + - an ambiguity with included files on Cygwin platforms + 2005-09-03 1.9.2: - only assertionFailed() will throw exceptions |
|
From: Ewald A. <ewa...@us...> - 2005-09-17 15:18:18
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21048/mockpp/docs/en Modified Files: Makefile.am Log Message: next release Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/Makefile.am,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- Makefile.am 15 Aug 2005 14:16:08 -0000 1.28 +++ Makefile.am 17 Sep 2005 15:18:09 -0000 1.29 @@ -20,8 +20,8 @@ test -f mockpp-$(VERSION)-handbook.zip && mv mockpp-$(VERSION)-handbook.zip $(top_builddir) rm -r mockpp-$(VERSION)-handbook -# pdf-files -doc: html-files + +doc: html-files pdf-files ################################################################ @@ -60,7 +60,7 @@ cp -R $(srcdir)/common var cp -R $(srcdir)/images var xsltproc --output var/mockpp.fo /usr/share/xml/docbook/stylesheet/nwalsh/current/fo/docbook.xsl $(srcdir)/index.docbook - fop var/mockpp.fo var/mockpp.pdf + fop var/mockpp.fo var/mockpp.pdf && mv var/mockpp.pdf $(top_builddir)/mockpp-$(VERSION)-handbook.pdf svg-files: xsltproc --output var/mockpp.fo /usr/share/xml/docbook/stylesheet/nwalsh/current/fo/docbook.xsl $(srcdir)/index.docbook |
|
From: Ewald A. <ewa...@us...> - 2005-09-17 08:29:09
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11187 Modified Files: configure.in Log Message: fixed compilation ambiguity when #including some header Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- configure.in 3 Sep 2005 09:44:41 -0000 1.87 +++ configure.in 17 Sep 2005 08:28:56 -0000 1.88 @@ -17,7 +17,7 @@ # MOCKPP_MAJOR_VERSION=1 MOCKPP_MINOR_VERSION=9 -MOCKPP_PATCH_VERSION=2 +MOCKPP_PATCH_VERSION=3 MOCKPP_MICRO_VERSION=33 MOCKPP_INTERFACE_AGE=0 |
|
From: Ewald A. <ewa...@us...> - 2005-09-17 08:14:04
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8019/mockpp/chaining Modified Files: Makefile.am Log Message: fixed compilation ambiguity when #including some header Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile.am 12 Jan 2005 20:25:06 -0000 1.9 +++ Makefile.am 17 Sep 2005 08:13:53 -0000 1.10 @@ -1,4 +1,5 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = $(INCLUDES) noinst_LTLIBRARIES = libchaining.la |
|
From: Ewald A. <ewa...@us...> - 2005-09-17 08:14:04
|
Update of /cvsroot/mockpp/mockpp/mockpp/production In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8019/mockpp/production Modified Files: Makefile.am Log Message: fixed compilation ambiguity when #including some header Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 7 May 2005 12:47:39 -0000 1.3 +++ Makefile.am 17 Sep 2005 08:13:54 -0000 1.4 @@ -1,4 +1,5 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = $(INCLUDES) lib_LTLIBRARIES = libmockpp_production.la |
|
From: Ewald A. <ewa...@us...> - 2005-09-17 08:14:04
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8019/mockpp/stub Modified Files: Makefile.am Log Message: fixed compilation ambiguity when #including some header Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.am 3 Mar 2005 16:11:42 -0000 1.7 +++ Makefile.am 17 Sep 2005 08:13:54 -0000 1.8 @@ -1,4 +1,5 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = $(INCLUDES) noinst_LTLIBRARIES = libstub.la |
|
From: Ewald A. <ewa...@us...> - 2005-09-17 08:14:04
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8019/mockpp/examples Modified Files: Makefile.am Log Message: fixed compilation ambiguity when #including some header Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile.am 24 Mar 2005 20:51:30 -0000 1.13 +++ Makefile.am 17 Sep 2005 08:13:53 -0000 1.14 @@ -1,6 +1,7 @@ SUBDIRS= tutorial -INCLUDES = $(all_includes) -I$(top_srcdir) $(EA_EXTRA_INC) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = $(INCLUDES) noinst_PROGRAMS = mock_greeter @@ -11,4 +12,4 @@ mock_greeter_LDADD = $(top_builddir)/mockpp/libmockpp.la $(EA_EXTRA_LIB) $(LIBDL) $(LIBCPPUNIT) \ -lstdc++ -mock_greeter_LDFLAGS = -L/opt/intel_cc_80/lib +mock_greeter_LDFLAGS = -L/opt/intel_cc_80/lib |
|
From: Ewald A. <ewa...@us...> - 2005-09-17 08:14:04
|
Update of /cvsroot/mockpp/mockpp/mockpp/matcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8019/mockpp/matcher Modified Files: Makefile.am Log Message: fixed compilation ambiguity when #including some header Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile.am 5 Mar 2005 16:29:37 -0000 1.13 +++ Makefile.am 17 Sep 2005 08:13:54 -0000 1.14 @@ -1,4 +1,5 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = $(INCLUDES) noinst_LTLIBRARIES = libmatcher.la |
|
From: Ewald A. <ewa...@us...> - 2005-09-17 08:14:04
|
Update of /cvsroot/mockpp/mockpp/mockpp/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8019/mockpp/builder Modified Files: Makefile.am Log Message: fixed compilation ambiguity when #including some header Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.am 4 Mar 2005 23:35:55 -0000 1.7 +++ Makefile.am 17 Sep 2005 08:13:53 -0000 1.8 @@ -1,4 +1,5 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = $(INCLUDES) libbuilderinclude_HEADERS = ArgumentsMatchBuilder.h BuilderNamespace.h IdentityBuilder.h InvocationMockerBuilder.h MatchBuilder.h StubBuilder.h |
|
From: Ewald A. <ewa...@us...> - 2005-09-17 08:14:04
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8019/mockpp/compat Modified Files: Makefile.am Log Message: fixed compilation ambiguity when #including some header Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile.am 24 Oct 2004 16:43:22 -0000 1.9 +++ Makefile.am 17 Sep 2005 08:13:53 -0000 1.10 @@ -1,4 +1,5 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = $(INCLUDES) noinst_LTLIBRARIES = libcompat.la |
|
From: Ewald A. <ewa...@us...> - 2005-09-17 08:14:04
|
Update of /cvsroot/mockpp/mockpp/mockpp/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8019/mockpp/util Modified Files: Makefile.am Log Message: fixed compilation ambiguity when #including some header Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.am 24 Oct 2004 16:43:22 -0000 1.7 +++ Makefile.am 17 Sep 2005 08:13:54 -0000 1.8 @@ -1,4 +1,5 @@ -INCLUDES = $(all_includes) -I$(top_srcdir) +INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = $(INCLUDES) noinst_LTLIBRARIES = libutil.la |
