[Mockpp-commits] mockpp/mockpp/constraint And.h,1.21,1.22 Constraint.h,1.8,1.9 ConstraintHolder.h,1.
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/constraint And.h,1.21,1.22 Constraint.h,1.8,1.9 ConstraintHolder.h,1.9,1.10 ConstraintList.h,1.8,1.9 ConstraintSet.cpp,1.2,1.3 ConstraintSet.h,1.17,1.18 ConstraintSetN.h,1.6,1.7 IsAnything.cpp,1.3,1.4 IsAnything.h,1.20,1.21 IsCloseTo.h,1.19,1.20 IsEqual.h,1.22,1.23 IsGreaterOrEqual.h,1.12,1.13 IsGreaterThan.h,1.16,1.17 IsInstanceOf.h,1.19,1.20 IsLessOrEqual.h,1.13,1.14 IsLessThan.h,1.16,1.17 IsNot.h,1.20,1.21 IsNothing.cpp,1.3,1.4 IsNothing.h,1.18,1.19 IsSame.h,1.21,1.22 Or.h,1.19,1.20 OutBound.h,1.2,1.3 StringContains.h,1.17,1.18 StringEndsWith.h,1.3,1.4 StringStartsWith.h,1.2,1.3 TypelessConstraint.cpp,1.2,1.3 TypelessConstraint.h,1.9,1.10 gen_constraintset_N.pl,1.2,1.3
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/constraint Modified Files: And.h Constraint.h ConstraintHolder.h ConstraintList.h ConstraintSet.cpp ConstraintSet.h ConstraintSetN.h IsAnything.cpp IsAnything.h IsCloseTo.h IsEqual.h IsGreaterOrEqual.h IsGreaterThan.h IsInstanceOf.h IsLessOrEqual.h IsLessThan.h IsNot.h IsNothing.cpp IsNothing.h IsSame.h Or.h OutBound.h StringContains.h StringEndsWith.h StringStartsWith.h TypelessConstraint.cpp TypelessConstraint.h gen_constraintset_N.pl Log Message: optionally disable mockpp namespace Index: IsAnything.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsAnything.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- IsAnything.cpp 29 Dec 2005 19:29:51 -0000 1.3 +++ IsAnything.cpp 15 Mar 2006 21:34:03 -0000 1.4 @@ -36,7 +36,7 @@ #include <mockpp/constraint/IsAnything.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT IsAnything::IsAnything() @@ -69,4 +69,4 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: ConstraintList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintList.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ConstraintList.h 29 Dec 2005 19:29:51 -0000 1.8 +++ ConstraintList.h 15 Mar 2006 21:34:03 -0000 1.9 @@ -45,7 +45,7 @@ #include <mockpp/constraint/IsAnything.h> -namespace mockpp { +MOCKPP_NS_START /** A class to verify lists of constraints, one after the other as they occur. @@ -290,7 +290,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ConstraintList_H Index: IsGreaterOrEqual.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsGreaterOrEqual.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- IsGreaterOrEqual.h 29 Dec 2005 19:29:51 -0000 1.12 +++ IsGreaterOrEqual.h 15 Mar 2006 21:34:03 -0000 1.13 @@ -36,12 +36,12 @@ #include <mockpp/compat/Formatter.h> -namespace mockpp { +MOCKPP_NS_START /** Is the value greater or equal than another value? * @ingroup grp_constraint - * @see mockpp::ge + * @see MOCKPP_NS::ge */ template <typename T> class IsGreaterOrEqual : public Constraint<T> @@ -84,7 +84,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ISGREATEROREQUAL_H Index: StringStartsWith.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/StringStartsWith.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- StringStartsWith.h 6 Jan 2005 13:09:22 -0000 1.2 +++ StringStartsWith.h 15 Mar 2006 21:34:03 -0000 1.3 @@ -36,14 +36,14 @@ #include <mockpp/compat/Formatter.h> -namespace mockpp { +MOCKPP_NS_START /** Tests if the argument is a string that contains a substring. * @ingroup grp_constraint - * @see mockpp::startsWith + * @see MOCKPP_NS::startsWith */ -template <typename StringType = mockpp::String> +template <typename StringType = MOCKPP_NS::String> class StringStartsWith : public Constraint<StringType> { public: @@ -89,7 +89,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_STRINGSTARTSWITH_H Index: OutBound.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/OutBound.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- OutBound.h 29 Dec 2005 19:29:51 -0000 1.2 +++ OutBound.h 15 Mar 2006 21:34:03 -0000 1.3 @@ -37,7 +37,7 @@ #include <mockpp/ReturnObjectList.h> -namespace mockpp { +MOCKPP_NS_START /** Passes a value back via a reference (outbound value). @@ -106,7 +106,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_OutBound_H Index: StringContains.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/StringContains.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- StringContains.h 29 Dec 2005 19:29:51 -0000 1.17 +++ StringContains.h 15 Mar 2006 21:34:03 -0000 1.18 @@ -40,14 +40,14 @@ #include <mockpp/compat/Formatter.h> -namespace mockpp { +MOCKPP_NS_START /** Tests if the argument is a string that contains a substring. * @ingroup grp_constraint - * @see mockpp::stringContains + * @see MOCKPP_NS::stringContains */ -template <typename StringType = mockpp::String> +template <typename StringType = MOCKPP_NS::String> class StringContains : public Constraint<StringType> { public: @@ -93,7 +93,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_STRINGCONTAINS_H Index: IsGreaterThan.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsGreaterThan.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- IsGreaterThan.h 29 Dec 2005 19:29:51 -0000 1.16 +++ IsGreaterThan.h 15 Mar 2006 21:34:03 -0000 1.17 @@ -40,12 +40,12 @@ #include <mockpp/compat/Formatter.h> -namespace mockpp { +MOCKPP_NS_START /** Is the value greater than another value? * @ingroup grp_constraint - * @see mockpp::gt + * @see MOCKPP_NS::gt */ template <typename T> class IsGreaterThan : public Constraint<T> @@ -88,7 +88,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ISGREATER_H Index: gen_constraintset_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/gen_constraintset_N.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gen_constraintset_N.pl 29 Dec 2005 19:29:51 -0000 1.2 +++ gen_constraintset_N.pl 15 Mar 2006 21:34:03 -0000 1.3 @@ -13,14 +13,14 @@ $totalNumArgs = $ARGV[0]; if ($totalNumArgs < 5) { $totalNumArgs = 5; } - + open OUT, ">ConstraintSetN.h"; -print OUT +print OUT "/** \@file \@internal NOT INTENDED FOR PUBLIC INCLUSION \@brief Generated with gen_constraintset_N.pl. - + \$I" . "d: ConstraintSetN.h,v 1.7 2005/10/19 20:53:09 ewald-arnold Exp \$ ***************************************************************************/ @@ -53,7 +53,7 @@ //#include <mockpp/builder/ConstraintSet.h> -namespace mockpp { +MOCKPP_NS_START "; for ($numArgs = 1; $numArgs <= $totalNumArgs; ++$numArgs) { @@ -66,18 +66,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) { @@ -112,7 +112,7 @@ $args .= "p$i"; } - + $boundArgs = ""; for ($i = 1; $i <= $numArgs; ++$i) { if ($i > 1) { @@ -127,7 +127,7 @@ $argsAsMembers .= "P$i p$i;"; } - + $copyParms = ""; for ($i = 1; $i <= $numArgs; ++$i) { if ($i > 1) { @@ -145,7 +145,7 @@ $hArgs .= "h$i"; } - + $initArgs = ""; if ($numArgs > 0) { $initArgs = ":"; @@ -157,14 +157,14 @@ $initArgs .= "p$i(ip$i)"; } - + $argTypes = ""; for ($i = 1; $i <= $numArgs; ++$i) { $argTypes .= "typedef P$i p". ($i+1) . "_type; "; } print "Creating ConstraintSet" . $numArgs ."\n"; - + print OUT " /** A set of constraints for a method with " . $numArgs . " arguments @@ -182,21 +182,21 @@ print OUT " /** Constructs the object"; - + for($p = 1; $p <= $numArgs; ++$p) { print OUT " * \@param in_constraint" . $p . " constraint " . $p . ""; } print OUT " */ ConstraintSet" . $numArgs . "( const ConstraintHolder<P1> &in_constraint1"; - + for($p = 2; $p <= $numArgs; ++$p) { print OUT " - , const ConstraintHolder<P" . $p . "> &in_constraint" . $p; } + , const ConstraintHolder<P" . $p . "> &in_constraint" . $p; } print OUT ") - : constraint1( in_constraint1 )"; - - + : constraint1( in_constraint1 )"; + + for($p = 2; $p <= $numArgs; ++$p) { print OUT " , constraint" . $p . "( in_constraint" . $p . " )"; } @@ -216,7 +216,7 @@ bool matches( const I &invocation ) { return constraint1->eval( invocation.getParameter1() )"; - + for($p = 2; $p <= $numArgs; ++$p) { print OUT " && constraint" . $p . "->eval( invocation.getParameter" . $p . "() )"; } @@ -254,7 +254,7 @@ print OUT " -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ConstraintSet_N_H Index: IsNot.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsNot.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- IsNot.h 29 Dec 2005 19:29:51 -0000 1.20 +++ IsNot.h 15 Mar 2006 21:34:03 -0000 1.21 @@ -39,12 +39,12 @@ #include <mockpp/constraint/ConstraintHolder.h> -namespace mockpp { +MOCKPP_NS_START /** Calculates the logical negation of a constraint. * @ingroup grp_constraint - * @see mockpp::ne + * @see MOCKPP_NS::ne */ template <typename T> class IsNot : public Constraint<T> @@ -90,7 +90,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ISNOT_H Index: TypelessConstraint.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/TypelessConstraint.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- TypelessConstraint.cpp 29 Dec 2005 19:29:51 -0000 1.2 +++ TypelessConstraint.cpp 15 Mar 2006 21:34:03 -0000 1.3 @@ -33,7 +33,7 @@ #include <mockpp/constraint/TypelessConstraint.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT TypelessConstraint::~TypelessConstraint() @@ -41,5 +41,5 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: IsAnything.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsAnything.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- IsAnything.h 29 Dec 2005 19:29:51 -0000 1.20 +++ IsAnything.h 15 Mar 2006 21:34:03 -0000 1.21 @@ -39,12 +39,12 @@ #include <mockpp/constraint/TypelessConstraint.h> -namespace mockpp { +MOCKPP_NS_START /** A constraint that always returns <code>true</code>. * @ingroup grp_constraint - * @see mockpp::any + * @see MOCKPP_NS::any */ class IsAnything : public TypelessConstraint { @@ -78,7 +78,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif //MOCKPP_ISANYTHING_H Index: IsEqual.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsEqual.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- IsEqual.h 29 Dec 2005 19:29:51 -0000 1.22 +++ IsEqual.h 15 Mar 2006 21:34:03 -0000 1.23 @@ -40,14 +40,14 @@ #include <mockpp/compat/Formatter.h> -namespace mockpp { +MOCKPP_NS_START /** Default comparison function for \c IsEqual. * The default implementation compares the values of the two * objects. * @ingroup grp_constraint - * @see mockpp::IsEqual + * @see MOCKPP_NS::IsEqual * @param left left operand * @param right right operand * @return true if both values are equal @@ -63,8 +63,8 @@ * invoked method? Basically the same as \c IsSame which compares * by reference and a specializable comparison template. * @ingroup grp_constraint - * @see mockpp::eq( const T& op ) - * @see mockpp::IsSame + * @see MOCKPP_NS::eq( const T& op ) + * @see MOCKPP_NS::IsSame */ template <typename T> class IsEqual : public Constraint<T> @@ -111,7 +111,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ISEQUAL_H Index: TypelessConstraint.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/TypelessConstraint.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- TypelessConstraint.h 29 Dec 2005 19:29:51 -0000 1.9 +++ TypelessConstraint.h 15 Mar 2006 21:34:03 -0000 1.10 @@ -38,7 +38,7 @@ #include <mockpp/constraint/Constraint.h> -namespace mockpp { +MOCKPP_NS_START /** A constraint where actual values are ignored. @@ -111,7 +111,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_TYPELESSCONSTRAINT_H Index: ConstraintSet.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintSet.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ConstraintSet.h 29 Dec 2005 19:29:51 -0000 1.17 +++ ConstraintSet.h 15 Mar 2006 21:34:03 -0000 1.18 @@ -38,7 +38,7 @@ #include <mockpp/mockpp.h> // always first -namespace mockpp { +MOCKPP_NS_START /** A set of constraints for a method without arguments * @internal @@ -72,7 +72,7 @@ -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_CONSTRAINTSET_H Index: Constraint.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/Constraint.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Constraint.h 29 Dec 2005 19:29:51 -0000 1.8 +++ Constraint.h 15 Mar 2006 21:34:03 -0000 1.9 @@ -41,7 +41,7 @@ #include <mockpp/SelfDescribing.h> -namespace mockpp { +MOCKPP_NS_START /** A constraint over acceptable values. @@ -70,7 +70,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_CONSTRAINT_H Index: IsCloseTo.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsCloseTo.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- IsCloseTo.h 29 Dec 2005 19:29:51 -0000 1.19 +++ IsCloseTo.h 15 Mar 2006 21:34:03 -0000 1.20 @@ -40,13 +40,13 @@ #include <mockpp/compat/Formatter.h> -namespace mockpp { +MOCKPP_NS_START /** Is the value of a number equal to a value within some range of * acceptable deviation? * @ingroup grp_constraint - * @see mockpp::eq( const T &operand, const T &deviation ) + * @see MOCKPP_NS::eq( const T &operand, const T &deviation ) */ template <typename NumberType> class IsCloseTo : public Constraint<NumberType> @@ -93,7 +93,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ISCLOSETO_H Index: IsLessThan.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsLessThan.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- IsLessThan.h 29 Dec 2005 19:29:51 -0000 1.16 +++ IsLessThan.h 15 Mar 2006 21:34:03 -0000 1.17 @@ -40,11 +40,11 @@ #include <mockpp/compat/Formatter.h> -namespace mockpp { +MOCKPP_NS_START /** Is the value less than another value? * @ingroup grp_constraint - * @see mockpp::lt + * @see MOCKPP_NS::lt */ template <typename T> class IsLessThan : public Constraint<T> @@ -87,7 +87,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ISLESSTHAN_H Index: IsNothing.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsNothing.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- IsNothing.h 29 Dec 2005 19:29:51 -0000 1.18 +++ IsNothing.h 15 Mar 2006 21:34:03 -0000 1.19 @@ -39,12 +39,12 @@ #include <mockpp/constraint/TypelessConstraint.h> -namespace mockpp { +MOCKPP_NS_START /** A constraint which is never true. * @ingroup grp_constraint - * @see mockpp::nothing + * @see MOCKPP_NS::nothing */ class IsNothing : public TypelessConstraint { @@ -81,7 +81,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ISNOTHING_H Index: IsSame.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsSame.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- IsSame.h 29 Dec 2005 19:29:51 -0000 1.21 +++ IsSame.h 15 Mar 2006 21:34:03 -0000 1.22 @@ -40,14 +40,14 @@ #include <mockpp/compat/Formatter.h> -namespace mockpp { +MOCKPP_NS_START /** Default comparison function for \c IsSame. * The default implementation compares the adresses of the two * objects. * @ingroup grp_constraint - * @see mockpp::IsSame + * @see MOCKPP_NS::IsSame * @param left left operand * @param right right operand * @return true if both operands are equal @@ -64,9 +64,9 @@ * \c IsSame compares by reference and a comparison template which can be * specialized. * @ingroup grp_constraint - * @see mockpp::same - * @see mockpp::IsEqual - * @see mockpp::isSameComparison + * @see MOCKPP_NS::same + * @see MOCKPP_NS::IsEqual + * @see MOCKPP_NS::isSameComparison */ template <typename T> class IsSame : public Constraint<T> @@ -113,7 +113,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ISSAME_H Index: IsLessOrEqual.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsLessOrEqual.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- IsLessOrEqual.h 29 Dec 2005 19:29:51 -0000 1.13 +++ IsLessOrEqual.h 15 Mar 2006 21:34:03 -0000 1.14 @@ -36,12 +36,12 @@ #include <mockpp/compat/Formatter.h> -namespace mockpp { +MOCKPP_NS_START /** Is the value less or equal than another value? * @ingroup grp_constraint - * @see mockpp::le + * @see MOCKPP_NS::le */ template <typename T> class IsLessOrEqual : public Constraint<T> @@ -84,7 +84,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ISLESSOREQUAL_H Index: StringEndsWith.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/StringEndsWith.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- StringEndsWith.h 29 Dec 2005 19:29:51 -0000 1.3 +++ StringEndsWith.h 15 Mar 2006 21:34:03 -0000 1.4 @@ -36,14 +36,14 @@ #include <mockpp/compat/Formatter.h> -namespace mockpp { +MOCKPP_NS_START /** Tests if the argument is a string that contains a substring. * @ingroup grp_constraint - * @see mockpp::endsWith + * @see MOCKPP_NS::endsWith */ -template <typename StringType = mockpp::String> +template <typename StringType = MOCKPP_NS::String> class StringEndsWith : public Constraint<StringType> { public: @@ -94,7 +94,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_STRINGENDSWITH_H Index: IsInstanceOf.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsInstanceOf.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- IsInstanceOf.h 29 Dec 2005 19:29:51 -0000 1.19 +++ IsInstanceOf.h 15 Mar 2006 21:34:03 -0000 1.20 @@ -39,7 +39,7 @@ #include <mockpp/constraint/Constraint.h> -namespace mockpp { +MOCKPP_NS_START #ifndef MOCKPP_NO_RTTI @@ -48,7 +48,7 @@ * A base class is needed since dynamic_cast checks for an existing traversal * from \c derived to \c base. * @ingroup grp_constraint - * @see mockpp::isA + * @see MOCKPP_NS::isA */ template <typename BASE, typename DERIVED> @@ -82,7 +82,7 @@ #endif // MOCKPP_NO_RTTI -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_ISINSTANCEOF_H Index: IsNothing.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/IsNothing.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- IsNothing.cpp 29 Dec 2005 19:29:51 -0000 1.3 +++ IsNothing.cpp 15 Mar 2006 21:34:03 -0000 1.4 @@ -36,7 +36,7 @@ #include <mockpp/constraint/IsNothing.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT IsNothing::IsNothing() @@ -69,4 +69,4 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: Or.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/Or.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Or.h 29 Dec 2005 19:29:51 -0000 1.19 +++ Or.h 15 Mar 2006 21:34:03 -0000 1.20 @@ -39,14 +39,14 @@ #include <mockpp/constraint/ConstraintHolder.h> -namespace mockpp { +MOCKPP_NS_START /** Calculates the logical disjunction of two constraints. Evaluation is * shortcut, so that the second constraint is not called if the first * constraint returns <code>true</code>. * @ingroup grp_constraint - * @see mockpp::logic_or + * @see MOCKPP_NS::logic_or */ template <typename T> class Or : public Constraint<T> @@ -99,7 +99,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_OR_H Index: And.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/And.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- And.h 29 Dec 2005 19:29:51 -0000 1.21 +++ And.h 15 Mar 2006 21:34:03 -0000 1.22 @@ -39,7 +39,7 @@ #include <mockpp/constraint/ConstraintHolder.h> -namespace mockpp { +MOCKPP_NS_START /** Calculates the logical conjunction of two constraints. Evaluation is @@ -97,7 +97,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_AND_H Index: ConstraintSet.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintSet.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ConstraintSet.cpp 29 Dec 2005 19:29:51 -0000 1.2 +++ ConstraintSet.cpp 15 Mar 2006 21:34:03 -0000 1.3 @@ -33,7 +33,7 @@ #include <mockpp/constraint/ConstraintSet.h> -namespace mockpp { +MOCKPP_NS_START String MOCKPP_EXPORT ConstraintSet0::describeTo( String &buffer ) const @@ -42,5 +42,5 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: ConstraintSetN.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintSetN.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ConstraintSetN.h 29 Dec 2005 19:29:51 -0000 1.6 +++ ConstraintSetN.h 15 Mar 2006 21:34:03 -0000 1.7 @@ -1,7 +1,7 @@ /** @file @internal NOT INTENDED FOR PUBLIC INCLUSION @brief Generated with gen_constraintset_N.pl. - + $Id$ ***************************************************************************/ @@ -34,7 +34,7 @@ //#include <mockpp/builder/ConstraintSet.h> -namespace mockpp { +MOCKPP_NS_START /** A set of constraints for a method with 1 arguments @@ -442,7 +442,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ConstraintSet_N_H Index: ConstraintHolder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintHolder.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ConstraintHolder.h 29 Dec 2005 19:29:51 -0000 1.9 +++ ConstraintHolder.h 15 Mar 2006 21:34:03 -0000 1.10 @@ -39,7 +39,7 @@ #include <mockpp/constraint/TypelessConstraint.h> -namespace mockpp { +MOCKPP_NS_START /** Proxy class to conveniently move constraints into constraint sets. @@ -98,7 +98,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_CONSTRAINTHOLDER_H |
