[Mockpp-commits] mockpp/mockpp/builder ArgumentsMatchBuilder.h,1.31,1.32 ArgumentsMatchBuilderN.h,1.
Brought to you by:
ewald-arnold
Menu
▾
▴
[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
|
From: Ewald A. <ewa...@us...> - 2006-03-15 21:34:45
|
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 |
