[Mockpp-commits] mockpp/mockpp/visiting CountedVisitableMethod.h,1.5,1.6 ResponseVector1.h,1.2,1.3 R
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/visiting CountedVisitableMethod.h,1.5,1.6 ResponseVector1.h,1.2,1.3 ResponseVector2.h,1.2,1.3 ResponseVector3.h,1.2,1.3 ResponseVector4.h,1.2,1.3 ResponseVector5.h,1.2,1.3 ResponseVector6.h,1.2,1.3 VisitableMockMethod.cpp,1.3,1.4 VisitableMockMethod.h,1.3,1.4 VisitableMockMethod0.h,1.3,1.4 VisitableMockMethod1.h,1.3,1.4 VisitableMockMethod2.h,1.3,1.4 VisitableMockMethod3.h,1.3,1.4 VisitableMockMethod4.h,1.3,1.4 VisitableMockMethod5.h,1.3,1.4 VisitableMockMethod6.h,1.3,1.4 VisitableMockObject.cpp,1.4,1.5 VisitableMockObject.h,1.4,1.5 VisitableMockObject_macro.h,1.2,1.3 VisitableMockObject_template.h,1.2,1.3 gen_countvisitable_N.pl,1.4,1.5 gen_responsevector_N.pl,1.2,1.3 gen_visitablemethod_N.pl,1.2,1.3
Update of /cvsroot/mockpp/mockpp/mockpp/visiting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/mockpp/visiting Modified Files: CountedVisitableMethod.h ResponseVector1.h ResponseVector2.h ResponseVector3.h ResponseVector4.h ResponseVector5.h ResponseVector6.h VisitableMockMethod.cpp VisitableMockMethod.h VisitableMockMethod0.h VisitableMockMethod1.h VisitableMockMethod2.h VisitableMockMethod3.h VisitableMockMethod4.h VisitableMockMethod5.h VisitableMockMethod6.h VisitableMockObject.cpp VisitableMockObject.h VisitableMockObject_macro.h VisitableMockObject_template.h gen_countvisitable_N.pl gen_responsevector_N.pl gen_visitablemethod_N.pl Log Message: optionally disable mockpp namespace Index: ResponseVector3.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/ResponseVector3.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ResponseVector3.h 29 Dec 2005 19:29:52 -0000 1.2 +++ ResponseVector3.h 15 Mar 2006 21:34:09 -0000 1.3 @@ -35,7 +35,7 @@ #include <mockpp/constraint/IsEqual.h> -namespace mockpp { +MOCKPP_NS_START /** Class returning a throwable depending on the parameters @@ -92,9 +92,9 @@ { counter.push_back(count); tvec.push_back(t); - typename mockpp::Constraint<P1>::AP cons1 (p1); - typename mockpp::Constraint<P2>::AP cons2 (p2); - typename mockpp::Constraint<P3>::AP cons3 (p3); + typename MOCKPP_NS::Constraint<P1>::AP cons1 (p1); + typename MOCKPP_NS::Constraint<P2>::AP cons2 (p2); + typename MOCKPP_NS::Constraint<P3>::AP cons3 (p3); t1vec.push_back(cons1.release()); t2vec.push_back(cons2.release()); t3vec.push_back(cons3.release()); @@ -286,7 +286,7 @@ MOCKPP_STL::vector<R> rvec; }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ResponseVector3_H Index: ResponseVector2.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/ResponseVector2.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ResponseVector2.h 29 Dec 2005 19:29:52 -0000 1.2 +++ ResponseVector2.h 15 Mar 2006 21:34:09 -0000 1.3 @@ -35,7 +35,7 @@ #include <mockpp/constraint/IsEqual.h> -namespace mockpp { +MOCKPP_NS_START /** Class returning a throwable depending on the parameters @@ -88,8 +88,8 @@ { counter.push_back(count); tvec.push_back(t); - typename mockpp::Constraint<P1>::AP cons1 (p1); - typename mockpp::Constraint<P2>::AP cons2 (p2); + typename MOCKPP_NS::Constraint<P1>::AP cons1 (p1); + typename MOCKPP_NS::Constraint<P2>::AP cons2 (p2); t1vec.push_back(cons1.release()); t2vec.push_back(cons2.release()); } @@ -265,7 +265,7 @@ MOCKPP_STL::vector<R> rvec; }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ResponseVector2_H Index: VisitableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject_macro.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- VisitableMockObject_macro.h 29 Dec 2005 19:29:52 -0000 1.2 +++ VisitableMockObject_macro.h 15 Mar 2006 21:34:10 -0000 1.3 @@ -193,9 +193,9 @@ } #define MOCKPP_CONTROLLER_IMPL_THROW(methname) \ - void addThrowable(mockpp::Throwable *t_) \ + void addThrowable(MOCKPP_NS::Throwable *t_) \ { \ - std::auto_ptr<mockpp::Throwable> at (t_); \ + std::auto_ptr<MOCKPP_NS::Throwable> at (t_); \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## Throwables.push_back(at.release()); \ objptr->methname ## ThrowableInsteadReturn.push_back(true); \ @@ -205,12 +205,12 @@ void addThrowable(const T &w, unsigned count = 1) \ { \ for ( ; count > 0; --count) \ - addThrowable(mockpp::make_throwable(w)); \ + addThrowable(MOCKPP_NS::make_throwable(w)); \ } \ \ - void setDefaultThrowable(mockpp::Throwable *t_) \ + void setDefaultThrowable(MOCKPP_NS::Throwable *t_) \ { \ - std::auto_ptr<mockpp::Throwable> at (t_); \ + std::auto_ptr<MOCKPP_NS::Throwable> at (t_); \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## DefaultThrowable.take(at.release()); \ } @@ -223,15 +223,15 @@ { \ if (objptr->methname ## haveDefaultReturnValue) \ { \ - mockpp::String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 is unused.")); \ + MOCKPP_NS::String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 is unused.")); \ fmt << MOCKPP_PCHAR(#methname) MOCKPP_PCHAR("DefaultReturnValueUsed"); \ MOCKPP_ASSERT_TRUE_MESSAGE(fmt, objptr->methname ## DefaultReturnValueUsed); \ } \ \ - mockpp::Throwable *dt = objptr->methname ## DefaultThrowable.get(); \ + MOCKPP_NS::Throwable *dt = objptr->methname ## DefaultThrowable.get(); \ if (dt != 0) \ { \ - mockpp::String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 is unused.")); \ + MOCKPP_NS::String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 is unused.")); \ fmt << MOCKPP_PCHAR(#methname) MOCKPP_PCHAR("DefaultThrowable"); \ MOCKPP_ASSERT_TRUE_MESSAGE(fmt, dt->hasThrown()); \ } \ @@ -244,10 +244,10 @@ #define MOCKPP_CONTROLLER_IMPL_VOID_VERIFY(methname) \ virtual void verify() \ { \ - mockpp::Throwable *dt = objptr->methname ## DefaultThrowable.get(); \ + MOCKPP_NS::Throwable *dt = objptr->methname ## DefaultThrowable.get(); \ if (dt != 0) \ { \ - mockpp::String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 is unused.")); \ + MOCKPP_NS::String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 is unused.")); \ fmt << MOCKPP_PCHAR(#methname) MOCKPP_PCHAR("DefaultThrowable"); \ MOCKPP_ASSERT_TRUE_MESSAGE(fmt, dt->hasThrown()); \ } \ @@ -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_NS::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_NS::ConstraintHolder< type1 > &p1, \ + const MOCKPP_NS::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_NS::ConstraintHolder< type1 > &p1, \ + const MOCKPP_NS::ConstraintHolder< type2 > &p2, \ + const MOCKPP_NS::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_NS::ConstraintHolder< type1 > &p1, \ + const MOCKPP_NS::ConstraintHolder< type2 > &p2, \ + const MOCKPP_NS::ConstraintHolder< type3 > &p3, \ + const MOCKPP_NS::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_NS::ConstraintHolder< type1 > &p1, \ + const MOCKPP_NS::ConstraintHolder< type2 > &p2, \ + const MOCKPP_NS::ConstraintHolder< type3 > &p3, \ + const MOCKPP_NS::ConstraintHolder< type4 > &p4, \ + const MOCKPP_NS::ConstraintHolder< type5 > &p5, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, p1, p2, p3, p4, p5, count); \ @@ -359,75 +359,75 @@ // #define MOCKPP_CONTROLLER_IMPL_RESP_THROW1(methname, type1) \ - void addResponseThrowable(mockpp::Throwable *t, const type1 &p1, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(MOCKPP_NS::Throwable *t, const type1 &p1, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ 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_NS::Throwable *t, const MOCKPP_NS::ConstraintHolder< type1 > &p1, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, count); \ } #define MOCKPP_CONTROLLER_IMPL_RESP_THROW2(methname, type1, type2) \ - void addResponseThrowable(mockpp::Throwable *t, const type1 &p1, const type2 &p2, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(MOCKPP_NS::Throwable *t, const type1 &p1, const type2 &p2, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ 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_NS::Throwable *t, const MOCKPP_NS::ConstraintHolder< type1 > &p1, \ + const MOCKPP_NS::ConstraintHolder< type2 > &p2, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, p2, count); \ } #define MOCKPP_CONTROLLER_IMPL_RESP_THROW3(methname, type1, type2, type3) \ - void addResponseThrowable(mockpp::Throwable *t, const type1 &p1, const type2 &p2, const type3 &p3, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(MOCKPP_NS::Throwable *t, const type1 &p1, const type2 &p2, const type3 &p3, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ 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_NS::Throwable *t, const MOCKPP_NS::ConstraintHolder< type1 > &p1, \ + const MOCKPP_NS::ConstraintHolder< type2 > &p2, \ + const MOCKPP_NS::ConstraintHolder< type3 > &p3, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, p2, p3, count); \ } #define MOCKPP_CONTROLLER_IMPL_RESP_THROW4(methname, type1, type2, type3, type4) \ - void addResponseThrowable(mockpp::Throwable *t, const type1 &p1, const type2 &p2, const type3 &p3, const type4 &p4, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(MOCKPP_NS::Throwable *t, const type1 &p1, const type2 &p2, const type3 &p3, const type4 &p4, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ 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_NS::Throwable *t, const MOCKPP_NS::ConstraintHolder< type1 > &p1, \ + const MOCKPP_NS::ConstraintHolder< type2 > &p2, \ + const MOCKPP_NS::ConstraintHolder< type3 > &p3, \ + const MOCKPP_NS::ConstraintHolder< type4 > &p4, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, p2, p3, p4, count); \ } #define MOCKPP_CONTROLLER_IMPL_RESP_THROW5(methname, type1, type2, type3, type4, type5) \ - void addResponseThrowable(mockpp::Throwable *t, const type1 &p1, const type2 &p2, const type3 &p3, const type4 &p4, const type5 &p5, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(MOCKPP_NS::Throwable *t, const type1 &p1, const type2 &p2, const type3 &p3, const type4 &p4, const type5 &p5, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ 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_NS::Throwable *t, const MOCKPP_NS::ConstraintHolder< type1 > &p1, \ + const MOCKPP_NS::ConstraintHolder< type2 > &p2, \ + const MOCKPP_NS::ConstraintHolder< type3 > &p3, \ + const MOCKPP_NS::ConstraintHolder< type4 > &p4, \ + const MOCKPP_NS::ConstraintHolder< type5 > &p5, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, p2, p3, p4, p5, count); \ @@ -440,7 +440,7 @@ #define MOCKPP_CONTROLLER_DECL_START(classname, methname) \ friend class ControllerFor ## methname; \ public: \ - class ControllerFor ## methname : public mockpp::VisitableMockObject::Controller \ + class ControllerFor ## methname : public MOCKPP_NS::VisitableMockObject::Controller \ { \ classname *objptr; \ public: \ @@ -585,13 +585,13 @@ // #define MOCKPP_DECLARE_DEFAULT_VARS(name) \ - mockpp::ThrowableItem name ## DefaultThrowable; \ - mutable mockpp::ThrowableList name ## Throwables; \ + MOCKPP_NS::ThrowableItem name ## DefaultThrowable; \ + mutable MOCKPP_NS::ThrowableList name ## Throwables; \ bool name ## ThrowablesInline; \ mutable MOCKPP_STL::vector<bool> name ## ThrowableInsteadReturn #define MOCKPP_DECLARE_RETURN_VARS(ret_type, name) \ - mutable mockpp::ReturnObjectList< ret_type > name ## ReturnValues; \ + mutable MOCKPP_NS::ReturnObjectList< ret_type > name ## ReturnValues; \ bool name ## haveDefaultReturnValue; \ mutable bool name ## DefaultReturnValueUsed; \ ret_type name ## DefaultReturnValue @@ -601,23 +601,23 @@ // #define MOCKPP_DECLARE_PARAMETER_VARS1(name, type1) \ - mutable mockpp::ConstraintList< type1 > name ## Parameter1 + mutable MOCKPP_NS::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_NS::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_NS::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_NS::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_NS::ConstraintList< type5 > name ## Parameter5 //////////////////////////////////////////////////////////////////////////// // @@ -671,7 +671,7 @@ } \ if (do_throw && name ## Throwables.hasMoreObjects() != 0) \ { \ - mockpp::Throwable *thr = name ## Throwables.nextThrowableObject(); \ + MOCKPP_NS::Throwable *thr = name ## Throwables.nextThrowableObject(); \ if (thr != 0) \ thr->throw_me(); \ } \ @@ -691,12 +691,12 @@ MOCKPP_STL::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ return;\ } \ else \ { \ - addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addActualMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ MOCKPP_THROWER_IMPL(m_name ); \ return;\ } \ @@ -721,15 +721,15 @@ MOCKPP_STL::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ return; \ } \ else \ { \ MOCKPP_TRY { \ - addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ - mockpp::Throwable *t; \ + addActualMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ + MOCKPP_NS::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1)) \ t->throw_me(); \ MOCKPP_THROWER_IMPL(m_name); \ @@ -742,14 +742,14 @@ } \ } \ \ - void a_name (const mockpp::ConstraintHolder< v_type1 > ¶m1) /* @todo const? */ \ + void a_name (const MOCKPP_NS::ConstraintHolder< v_type1 > ¶m1) /* @todo const? */ \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ + addExpectedMethod(MOCKPP_NS::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_NS::ResponseThrowableVector1< v_type1 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS1(m_name, v_type1); \ MOCKPP_VOID_CONTROLLER_DECL1(classname, m_name, v_type1) @@ -771,7 +771,7 @@ MOCKPP_STL::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ return; \ @@ -779,8 +779,8 @@ else \ { \ MOCKPP_TRY { \ - addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ - mockpp::Throwable *t; \ + addActualMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ + MOCKPP_NS::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2)) \ t->throw_me(); \ MOCKPP_THROWER_IMPL(m_name); \ @@ -795,16 +795,16 @@ } \ } \ \ - void a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ - const mockpp::ConstraintHolder< v_type2 > ¶m2) /* @todo const? */ \ + void a_name(const MOCKPP_NS::ConstraintHolder< v_type1 > ¶m1, \ + const MOCKPP_NS::ConstraintHolder< v_type2 > ¶m2) /* @todo const? */ \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ m_name ## Parameter2.addExpected(param2); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ - mutable mockpp::ResponseThrowableVector2< v_type1, v_type2 > m_name ## ResponseValues; \ + mutable MOCKPP_NS::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) @@ -828,7 +828,7 @@ MOCKPP_STL::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -837,8 +837,8 @@ else \ { \ MOCKPP_TRY { \ - addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ - mockpp::Throwable *t; \ + addActualMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ + MOCKPP_NS::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3)) \ t->throw_me(); \ MOCKPP_THROWER_IMPL(m_name); \ @@ -855,18 +855,18 @@ } \ } \ \ - 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_NS::ConstraintHolder< v_type1 > ¶m1, \ + const MOCKPP_NS::ConstraintHolder< v_type2 > ¶m2, \ + const MOCKPP_NS::ConstraintHolder< v_type3 > ¶m3) /* @todo const? */ \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ m_name ## Parameter2.addExpected(param2); \ m_name ## Parameter3.addExpected(param3); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ - mutable mockpp::ResponseThrowableVector3< v_type1, v_type2, v_type3 > m_name ## ResponseValues; \ + mutable MOCKPP_NS::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) @@ -892,7 +892,7 @@ MOCKPP_STL::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -902,8 +902,8 @@ else \ { \ MOCKPP_TRY { \ - addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ - mockpp::Throwable *t; \ + addActualMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ + MOCKPP_NS::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4)) \ t->throw_me(); \ MOCKPP_THROWER_IMPL(m_name); \ @@ -922,12 +922,12 @@ } \ } \ \ - 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_NS::ConstraintHolder< v_type1 > ¶m1, \ + const MOCKPP_NS::ConstraintHolder< v_type2 > ¶m2, \ + const MOCKPP_NS::ConstraintHolder< v_type3 > ¶m3, \ + const MOCKPP_NS::ConstraintHolder< v_type4 > ¶m4) /* @todo const? */ \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ m_name ## Parameter2.addExpected(param2); \ m_name ## Parameter3.addExpected(param3); \ @@ -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_NS::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) @@ -963,7 +963,7 @@ MOCKPP_STL::string func_name (#m_name); \ if (!isActivated() ) \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -974,8 +974,8 @@ else \ { \ MOCKPP_TRY { \ - addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ - mockpp::Throwable *t; \ + addActualMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ + MOCKPP_NS::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5)) \ t->throw_me(); \ MOCKPP_THROWER_IMPL(m_name); \ @@ -996,13 +996,13 @@ } \ } \ \ - 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_NS::ConstraintHolder< v_type1 > ¶m1, \ + const MOCKPP_NS::ConstraintHolder< v_type2 > ¶m2, \ + const MOCKPP_NS::ConstraintHolder< v_type3 > ¶m3, \ + const MOCKPP_NS::ConstraintHolder< v_type4 > ¶m4, \ + const MOCKPP_NS::ConstraintHolder< v_type5 > ¶m5) /* @todo const? */ \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ m_name ## Parameter2.addExpected(param2); \ m_name ## Parameter3.addExpected(param3); \ @@ -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_NS::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) @@ -1030,13 +1030,13 @@ MOCKPP_STL::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ v_ret_type ret_val = v_ret_type(); \ return ret_val; \ } \ else \ { \ - addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addActualMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ MOCKPP_THROWER_IMPL(m_name); \ \ if (m_name ## ReturnValues.hasMoreObjects()) \ @@ -1070,7 +1070,7 @@ MOCKPP_STL::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ v_ret_type ret_val = v_ret_type(); \ return ret_val; \ @@ -1078,8 +1078,8 @@ else \ { \ MOCKPP_TRY { \ - addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ - mockpp::Throwable *t; \ + addActualMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ + MOCKPP_NS::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1)) \ t->throw_me(); \ MOCKPP_THROWER_IMPL(m_name); \ @@ -1100,16 +1100,16 @@ } \ } \ \ - m_ret_type a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1) /* @todo const? */ \ + m_ret_type a_name(const MOCKPP_NS::ConstraintHolder< v_type1 > ¶m1) /* @todo const? */ \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ return v_ret_type(); \ } \ 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_NS::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) @@ -1133,7 +1133,7 @@ MOCKPP_STL::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ v_ret_type ret_val = v_ret_type(); \ @@ -1142,8 +1142,8 @@ else \ { \ MOCKPP_TRY { \ - addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ - mockpp::Throwable *t; \ + addActualMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ + MOCKPP_NS::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2)) \ t->throw_me(); \ MOCKPP_THROWER_IMPL(m_name); \ @@ -1166,10 +1166,10 @@ } \ } \ \ - 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_NS::ConstraintHolder< v_type1 > ¶m1, \ + const MOCKPP_NS::ConstraintHolder< v_type2 > ¶m2) /* @todo const? */ \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ m_name ## Parameter2.addExpected(param2); \ return v_ret_type(); \ @@ -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_NS::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) @@ -1203,7 +1203,7 @@ MOCKPP_STL::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -1213,8 +1213,8 @@ else \ { \ MOCKPP_TRY { \ - addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ - mockpp::Throwable *t; \ + addActualMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ + MOCKPP_NS::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3)) \ t->throw_me(); \ MOCKPP_THROWER_IMPL(m_name); \ @@ -1239,11 +1239,11 @@ } \ } \ \ - 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_NS::ConstraintHolder< v_type1 > ¶m1, \ + const MOCKPP_NS::ConstraintHolder< v_type2 > ¶m2, \ + const MOCKPP_NS::ConstraintHolder< v_type3 > ¶m3) /* @todo const? */ \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ m_name ## Parameter2.addExpected(param2); \ m_name ## Parameter3.addExpected(param3); \ @@ -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_NS::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) @@ -1279,7 +1279,7 @@ MOCKPP_STL::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -1290,8 +1290,8 @@ else \ { \ MOCKPP_TRY { \ - addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ - mockpp::Throwable *t; \ + addActualMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ + MOCKPP_NS::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4)) \ t->throw_me(); \ MOCKPP_THROWER_IMPL(m_name); \ @@ -1318,12 +1318,12 @@ } \ } \ \ - 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_NS::ConstraintHolder< v_type1 > ¶m1, \ + const MOCKPP_NS::ConstraintHolder< v_type2 > ¶m2, \ + const MOCKPP_NS::ConstraintHolder< v_type3 > ¶m3, \ + const MOCKPP_NS::ConstraintHolder< v_type4 > ¶m4) /* @todo const? */ \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ m_name ## Parameter2.addExpected(param2); \ m_name ## Parameter3.addExpected(param3); \ @@ -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_NS::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) @@ -1362,7 +1362,7 @@ MOCKPP_STL::string func_name = #m_name; \ if (!isActivated() ) \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ m_name ## Parameter1.addExpected((v_type1)param1); \ m_name ## Parameter2.addExpected((v_type2)param2); \ m_name ## Parameter3.addExpected((v_type3)param3); \ @@ -1374,8 +1374,8 @@ else \ { \ MOCKPP_TRY { \ - addActualMethod(mockpp::getLatin1(getVerifiableName()) + "." + func_name); \ - mockpp::Throwable *t; \ + addActualMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + func_name); \ + MOCKPP_NS::Throwable *t; \ if (m_name ## ResponseValues.find(t, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5)) \ t->throw_me(); \ MOCKPP_THROWER_IMPL(m_name); \ @@ -1404,13 +1404,13 @@ } \ } \ \ - 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_NS::ConstraintHolder< v_type1 > ¶m1, \ + const MOCKPP_NS::ConstraintHolder< v_type2 > ¶m2, \ + const MOCKPP_NS::ConstraintHolder< v_type3 > ¶m3, \ + const MOCKPP_NS::ConstraintHolder< v_type4 > ¶m4, \ + const MOCKPP_NS::ConstraintHolder< v_type5 > ¶m5) /* @todo const? */ \ { \ - addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ + addExpectedMethod(MOCKPP_NS::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ m_name ## Parameter2.addExpected(param2); \ m_name ## Parameter3.addExpected(param3); \ @@ -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_NS::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) Index: gen_visitablemethod_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/gen_visitablemethod_N.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gen_visitablemethod_N.pl 29 Dec 2005 19:29:52 -0000 1.2 +++ gen_visitablemethod_N.pl 15 Mar 2006 21:34:10 -0000 1.3 @@ -54,16 +54,16 @@ #include <mockpp/mockpp.h> -#include <mockpp/VisitableMockObject.h> -#include <mockpp/VisitableMockMethod.h>"; +#include <mockpp/visiting/VisitableMockObject.h> +#include <mockpp/visiting/VisitableMockMethod.h>"; if ($numArgs > 0){ print OUT " -#include <mockpp/ResponseVector" . $numArgs . ".h>"; } +#include <mockpp/visiting/ResponseVector" . $numArgs . ".h>"; } print OUT " -namespace mockpp { +MOCKPP_NS_START "; @@ -542,7 +542,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_VisitableMockMethod" . $numArgs . "_H Index: CountedVisitableMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/CountedVisitableMethod.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- CountedVisitableMethod.h 18 Jan 2006 19:56:50 -0000 1.5 +++ CountedVisitableMethod.h 15 Mar 2006 21:34:09 -0000 1.6 @@ -42,7 +42,7 @@ #include <mockpp/visiting/VisitableMockMethod6.h> -namespace mockpp { +MOCKPP_NS_START #ifndef MOCKPP_COUNTED_WEAKNESS @@ -455,7 +455,7 @@ #endif // MOCKPP_COUNTED_WEAKNESS -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_COUNTEDVISITABLEMETHOD_H Index: VisitableMockMethod4.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod4.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockMethod4.h 29 Dec 2005 19:29:52 -0000 1.3 +++ VisitableMockMethod4.h 15 Mar 2006 21:34:10 -0000 1.4 @@ -38,7 +38,7 @@ #include <mockpp/visiting/ResponseVector4.h> -namespace mockpp { +MOCKPP_NS_START /** Common stuff to set up visitable mock method expectations with 4 parameters. @@ -315,7 +315,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_VisitableMockMethod4_H Index: gen_countvisitable_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/gen_countvisitable_N.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gen_countvisitable_N.pl 18 Jan 2006 19:56:50 -0000 1.4 +++ gen_countvisitable_N.pl 15 Mar 2006 21:34:10 -0000 1.5 @@ -65,7 +65,7 @@ print OUT " -namespace mockpp { +MOCKPP_NS_START #ifndef MOCKPP_COUNTED_WEAKNESS @@ -259,7 +259,7 @@ #endif // MOCKPP_COUNTED_WEAKNESS -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_COUNTEDVISITABLEMETHOD_H Index: VisitableMockMethod5.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod5.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockMethod5.h 29 Dec 2005 19:29:52 -0000 1.3 +++ VisitableMockMethod5.h 15 Mar 2006 21:34:10 -0000 1.4 @@ -38,7 +38,7 @@ #include <mockpp/visiting/ResponseVector5.h> -namespace mockpp { +MOCKPP_NS_START /** Common stuff to set up visitable mock method expectations with 5 parameters. @@ -331,7 +331,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_VisitableMockMethod5_H Index: VisitableMockMethod.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockMethod.cpp 29 Dec 2005 19:29:52 -0000 1.3 +++ VisitableMockMethod.cpp 15 Mar 2006 21:34:09 -0000 1.4 @@ -34,7 +34,7 @@ #include <mockpp/visiting/VisitableMockMethod.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT VisitableMockMethodBase::VisitableMockMethodBase(const String &name, @@ -68,5 +68,5 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: gen_responsevector_N.pl =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/gen_responsevector_N.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gen_responsevector_N.pl 29 Dec 2005 19:29:52 -0000 1.2 +++ gen_responsevector_N.pl 15 Mar 2006 21:34:10 -0000 1.3 @@ -56,7 +56,7 @@ #include <mockpp/constraint/IsEqual.h> -namespace mockpp { +MOCKPP_NS_START "; @@ -223,7 +223,7 @@ tvec.push_back(t);"; for($p = 1; $p <= $numArgs; ++$p) { print OUT " - typename mockpp::Constraint<P" . $p . ">::AP cons" . $p . " (p" . $p . ");"; } + typename MOCKPP_NS::Constraint<P" . $p . ">::AP cons" . $p . " (p" . $p . ");"; } for($p = 1; $p <= $numArgs; ++$p) { print OUT " t" . $p . "vec.push_back(cons" . $p . ".release());"; } @@ -435,7 +435,7 @@ MOCKPP_STL::vector<R> rvec; }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ResponseVector" . $numArgs . "_H Index: VisitableMockMethod6.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod6.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockMethod6.h 29 Dec 2005 19:29:52 -0000 1.3 +++ VisitableMockMethod6.h 15 Mar 2006 21:34:10 -0000 1.4 @@ -38,7 +38,7 @@ #include <mockpp/visiting/ResponseVector6.h> -namespace mockpp { +MOCKPP_NS_START /** Common stuff to set up visitable mock method expectations with 6 parameters. @@ -347,7 +347,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_VisitableMockMethod6_H Index: ResponseVector4.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/ResponseVector4.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ResponseVector4.h 29 Dec 2005 19:29:52 -0000 1.2 +++ ResponseVector4.h 15 Mar 2006 21:34:09 -0000 1.3 @@ -35,7 +35,7 @@ #include <mockpp/constraint/IsEqual.h> -namespace mockpp { +MOCKPP_NS_START /** Class returning a throwable depending on the parameters @@ -96,10 +96,10 @@ { counter.push_back(count); tvec.push_back(t); - typename mockpp::Constraint<P1>::AP cons1 (p1); - typename mockpp::Constraint<P2>::AP cons2 (p2); - typename mockpp::Constraint<P3>::AP cons3 (p3); - typename mockpp::Constraint<P4>::AP cons4 (p4); + typename MOCKPP_NS::Constraint<P1>::AP cons1 (p1); + typename MOCKPP_NS::Constraint<P2>::AP cons2 (p2); + typename MOCKPP_NS::Constraint<P3>::AP cons3 (p3); + typename MOCKPP_NS::Constraint<P4>::AP cons4 (p4); t1vec.push_back(cons1.release()); t2vec.push_back(cons2.release()); t3vec.push_back(cons3.release()); @@ -307,7 +307,7 @@ MOCKPP_STL::vector<R> rvec; }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ResponseVector4_H Index: ResponseVector5.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/ResponseVector5.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ResponseVector5.h 29 Dec 2005 19:29:52 -0000 1.2 +++ ResponseVector5.h 15 Mar 2006 21:34:09 -0000 1.3 @@ -35,7 +35,7 @@ #include <mockpp/constraint/IsEqual.h> -namespace mockpp { +MOCKPP_NS_START /** Class returning a throwable depending on the parameters @@ -100,11 +100,11 @@ { counter.push_back(count); tvec.push_back(t); - typename mockpp::Constraint<P1>::AP cons1 (p1); - typename mockpp::Constraint<P2>::AP cons2 (p2); - typename mockpp::Constraint<P3>::AP cons3 (p3); - typename mockpp::Constraint<P4>::AP cons4 (p4); - typename mockpp::Constraint<P5>::AP cons5 (p5); + typename MOCKPP_NS::Constraint<P1>::AP cons1 (p1); + typename MOCKPP_NS::Constraint<P2>::AP cons2 (p2); + typename MOCKPP_NS::Constraint<P3>::AP cons3 (p3); + typename MOCKPP_NS::Constraint<P4>::AP cons4 (p4); + typename MOCKPP_NS::Constraint<P5>::AP cons5 (p5); t1vec.push_back(cons1.release()); t2vec.push_back(cons2.release()); t3vec.push_back(cons3.release()); @@ -328,7 +328,7 @@ MOCKPP_STL::vector<R> rvec; }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ResponseVector5_H Index: VisitableMockMethod0.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod0.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockMethod0.h 29 Dec 2005 19:29:52 -0000 1.3 +++ VisitableMockMethod0.h 15 Mar 2006 21:34:09 -0000 1.4 @@ -37,7 +37,7 @@ #include <mockpp/visiting/VisitableMockMethod.h> -namespace mockpp { +MOCKPP_NS_START /** Common stuff to set up visitable mock method expectations with 0 parameters. @@ -150,7 +150,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_VisitableMockMethod0_H Index: ResponseVector6.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/ResponseVector6.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ResponseVector6.h 29 Dec 2005 19:29:52 -0000 1.2 +++ ResponseVector6.h 15 Mar 2006 21:34:09 -0000 1.3 @@ -35,7 +35,7 @@ #include <mockpp/constraint/IsEqual.h> -namespace mockpp { +MOCKPP_NS_START /** Class returning a throwable depending on the parameters @@ -104,12 +104,12 @@ { counter.push_back(count); tvec.push_back(t); - typename mockpp::Constraint<P1>::AP cons1 (p1); - typename mockpp::Constraint<P2>::AP cons2 (p2); - typename mockpp::Constraint<P3>::AP cons3 (p3); - typename mockpp::Constraint<P4>::AP cons4 (p4); - typename mockpp::Constraint<P5>::AP cons5 (p5); - typename mockpp::Constraint<P6>::AP cons6 (p6); + typename MOCKPP_NS::Constraint<P1>::AP cons1 (p1); + typename MOCKPP_NS::Constraint<P2>::AP cons2 (p2); + typename MOCKPP_NS::Constraint<P3>::AP cons3 (p3); + typename MOCKPP_NS::Constraint<P4>::AP cons4 (p4); + typename MOCKPP_NS::Constraint<P5>::AP cons5 (p5); + typename MOCKPP_NS::Constraint<P6>::AP cons6 (p6); t1vec.push_back(cons1.release()); t2vec.push_back(cons2.release()); t3vec.push_back(cons3.release()); @@ -349,7 +349,7 @@ MOCKPP_STL::vector<R> rvec; }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ResponseVector6_H Index: VisitableMockMethod1.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod1.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockMethod1.h 29 Dec 2005 19:29:52 -0000 1.3 +++ VisitableMockMethod1.h 15 Mar 2006 21:34:09 -0000 1.4 @@ -38,7 +38,7 @@ #include <mockpp/visiting/ResponseVector1.h> -namespace mockpp { +MOCKPP_NS_START /** Common stuff to set up visitable mock method expectations with 1 parameters. @@ -267,7 +267,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_VisitableMockMethod1_H Index: VisitableMockMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockMethod.h 29 Dec 2005 19:29:52 -0000 1.3 +++ VisitableMockMethod.h 15 Mar 2006 21:34:09 -0000 1.4 @@ -37,7 +37,7 @@ //#include <mockpp/CountedVisitableMethod.h> -namespace mockpp { +MOCKPP_NS_START /** Base of all mock methods. @@ -302,7 +302,7 @@ }; -} // namespace mockpp +MOCKPP_NS_END #endif // MOCKPP_VisitableMockMethod_H Index: VisitableMockMethod2.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod2.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockMethod2.h 29 Dec 2005 19:29:52 -0000 1.3 +++ VisitableMockMethod2.h 15 Mar 2006 21:34:10 -0000 1.4 @@ -38,7 +38,7 @@ #include <mockpp/visiting/ResponseVector2.h> -namespace mockpp { +MOCKPP_NS_START /** Common stuff to set up visitable mock method expectations with 2 parameters. @@ -283,7 +283,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_VisitableMockMethod2_H Index: VisitableMockObject_template.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject_template.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- VisitableMockObject_template.h 29 Dec 2005 19:29:52 -0000 1.2 +++ VisitableMockObject_template.h 15 Mar 2006 21:34:10 -0000 1.3 @@ -35,7 +35,7 @@ #include <mockpp/constraint/IsEqual.h> -namespace mockpp { +MOCKPP_NS_START #ifndef DOXYGEN_SHOULD_SKIP_THIS @@ -97,7 +97,7 @@ #endif // DOXYGEN_SHOULD_SKIP_THIS -} // namespace mockpp +MOCKPP_NS_END #include "ResponseVector1.h" Index: VisitableMockObject.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- VisitableMockObject.cpp 3 Jan 2006 15:12:35 -0000 1.4 +++ VisitableMockObject.cpp 15 Mar 2006 21:34:10 -0000 1.5 @@ -33,7 +33,7 @@ #include <mockpp/visiting/VisitableMockObject.h> -namespace mockpp { +MOCKPP_NS_START MOCKPP_EXPORT VisitableMockObjectBase::VisitableMockObjectBase(const String &name, VerifiableList *parent) @@ -155,4 +155,4 @@ } -} // namespace mockpp +MOCKPP_NS_END Index: VisitableMockMethod3.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod3.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockMethod3.h 29 Dec 2005 19:29:52 -0000 1.3 +++ VisitableMockMethod3.h 15 Mar 2006 21:34:10 -0000 1.4 @@ -38,7 +38,7 @@ #include <mockpp/visiting/ResponseVector3.h> -namespace mockpp { +MOCKPP_NS_START /** Common stuff to set up visitable mock method expectations with 3 parameters. @@ -299,7 +299,7 @@ }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_VisitableMockMethod3_H Index: ResponseVector1.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/ResponseVector1.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ResponseVector1.h 29 Dec 2005 19:29:52 -0000 1.2 +++ ResponseVector1.h 15 Mar 2006 21:34:09 -0000 1.3 @@ -35,7 +35,7 @@ #include <mockpp/constraint/IsEqual.h> -namespace mockpp { +MOCKPP_NS_START /** Class returning a throwable depending on the parameters @@ -84,7 +84,7 @@ { counter.push_back(count); tvec.push_back(t); - typename mockpp::Constraint<P1>::AP cons1 (p1); + typename MOCKPP_NS::Constraint<P1>::AP cons1 (p1); t1vec.push_back(cons1.release()); } @@ -244,7 +244,7 @@ MOCKPP_STL::vector<R> rvec; }; -} // ns mockpp +MOCKPP_NS_END #endif // MOCKPP_ResponseVector1_H Index: VisitableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- VisitableMockObject.h 3 Jan 2006 15:12:35 -0000 1.4 +++ VisitableMockObjec... [truncated message content] |
