[Mockpp-commits] mockpp/mockpp/builder ArgumentsMatchBuilder.h,1.30,1.31 ArgumentsMatchBuilderN.h,1.
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/builder ArgumentsMatchBuilder.h,1.30,1.31 ArgumentsMatchBuilderN.h,1.7,1.8 BuilderNamespace.cpp,1.4,1.5 BuilderNamespace.h,1.25,1.26 IdentityBuilder.cpp,1.2,1.3 IdentityBuilder.h,1.11,1.12 InvocationMockerBuilder.h,1.36,1.37 MatchBuilder.h,1.36,1.37 StubBuilder.h,1.24,1.25 gen_argumentsmatchbuilder_N.pl,1.2,1.3
|
From: Ewald A. <ewa...@us...> - 2005-12-29 19:30:05
|
Update of /cvsroot/mockpp/mockpp/mockpp/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12933/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: update copyright date Index: gen_argumentsmatchbuilder_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/gen_argumentsmatchbuilder_N.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gen_argumentsmatchbuilder_N.pl 29 Oct 2005 19:09:27 -0000 1.2 +++ gen_argumentsmatchbuilder_N.pl 29 Dec 2005 19:29:50 -0000 1.3 @@ -28,7 +28,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: IdentityBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/IdentityBuilder.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- IdentityBuilder.h 4 Mar 2005 23:35:55 -0000 1.11 +++ IdentityBuilder.h 29 Dec 2005 19:29:50 -0000 1.12 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: ArgumentsMatchBuilderN.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/ArgumentsMatchBuilderN.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ArgumentsMatchBuilderN.h 13 Nov 2005 11:53:18 -0000 1.7 +++ ArgumentsMatchBuilderN.h 29 Dec 2005 19:29:50 -0000 1.8 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: ArgumentsMatchBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/ArgumentsMatchBuilder.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- ArgumentsMatchBuilder.h 28 Oct 2005 19:04:04 -0000 1.30 +++ ArgumentsMatchBuilder.h 29 Dec 2005 19:29:50 -0000 1.31 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: InvocationMockerBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/InvocationMockerBuilder.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- InvocationMockerBuilder.h 3 Apr 2005 18:32:45 -0000 1.36 +++ InvocationMockerBuilder.h 29 Dec 2005 19:29:50 -0000 1.37 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify @@ -113,25 +113,25 @@ protected: - /** Indicate a matcher for a set of arguments. - * @param constraintset constraint set - * @return the builder object - */ - virtual MatchBuilder<R, I> &with_cs( const CS &constraintset ) - { - return internalWith_cs( constraintset); - } - - /** Indicate a matcher for a set of arguments. - * Needed for compilers that can't invoke \c InvocationMockerBuilder<>::with_cs() directly. - * @param constraintset constraint set - * @return the builder object - */ - virtual MatchBuilder<R, I> &internalWith_cs( const CS &constraintset ) - { - return addMatcher( new ArgumentsMatcher<I>( constraintset ) ); - } - + /** Indicate a matcher for a set of arguments. + * @param constraintset constraint set + * @return the builder object + */ + virtual MatchBuilder<R, I> &with_cs( const CS &constraintset ) + { + return internalWith_cs( constraintset); + } + + /** Indicate a matcher for a set of arguments. + * Needed for compilers that can't invoke \c InvocationMockerBuilder<>::with_cs() directly. + * @param constraintset constraint set + * @return the builder object + */ + virtual MatchBuilder<R, I> &internalWith_cs( const CS &constraintset ) + { + return addMatcher( new ArgumentsMatcher<I>( constraintset ) ); + } + /** Gets the builder namespace. * @return pointer to builder namspace */ Index: BuilderNamespace.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/BuilderNamespace.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- BuilderNamespace.cpp 30 Dec 2004 20:54:04 -0000 1.4 +++ BuilderNamespace.cpp 29 Dec 2005 19:29:50 -0000 1.5 @@ -8,7 +8,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: BuilderNamespace.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/BuilderNamespace.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- BuilderNamespace.h 13 Nov 2005 11:53:18 -0000 1.25 +++ BuilderNamespace.h 29 Dec 2005 19:29:50 -0000 1.26 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: MatchBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/MatchBuilder.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- MatchBuilder.h 6 Apr 2005 19:26:38 -0000 1.36 +++ MatchBuilder.h 29 Dec 2005 19:29:50 -0000 1.37 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sat Aug 21 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify @@ -172,12 +172,12 @@ getMocker() ->addMatcher( new InvokedAfterMatcher<I>( priorCallRecorder.get(), priorCallDescription ) ); - if (priorCallBuilder != 0) + if (priorCallBuilder != 0) #if defined(_MSC_VER) && (_MSC_VER <= 1300) - priorCallBuilder->match( (TypelessMatcher*)priorCallRecorder.release() ); + priorCallBuilder->match( (TypelessMatcher*)priorCallRecorder.release() ); #else - priorCallBuilder->match(priorCallRecorder); -#endif + priorCallBuilder->match(priorCallRecorder); +#endif else idTable.addPendingRecorder(priorCallID, priorCallRecorder); } Index: IdentityBuilder.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/IdentityBuilder.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- IdentityBuilder.cpp 5 Mar 2005 15:50:46 -0000 1.2 +++ IdentityBuilder.cpp 29 Dec 2005 19:29:50 -0000 1.3 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify Index: StubBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/StubBuilder.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- StubBuilder.h 25 Mar 2005 16:30:28 -0000 1.24 +++ StubBuilder.h 29 Dec 2005 19:29:50 -0000 1.25 @@ -9,7 +9,7 @@ /************************************************************************** begin : Sun Aug 22 2004 - copyright : (C) 2002-2005 by Ewald Arnold + copyright : (C) 2002-2006 by Ewald Arnold email : mockpp at ewald-arnold dot de This program is free software; you can redistribute it and/or modify |
