Thread: [Mockpp-commits] mockpp/mockpp VisitableMockObject_macro.h,1.31,1.32
Brought to you by:
ewald-arnold
From: Ewald A. <ewa...@us...> - 2005-09-19 18:33:49
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21952/mockpp Modified Files: VisitableMockObject_macro.h Log Message: add spaces to enable templates as macros Index: VisitableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_macro.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- VisitableMockObject_macro.h 31 Jul 2005 14:22:57 -0000 1.31 +++ VisitableMockObject_macro.h 19 Sep 2005 18:33:40 -0000 1.32 @@ -286,7 +286,7 @@ objptr->methname ## ResponseValues.add(rv, (type1&)p1, count); \ } \ \ - void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder< type1 > &p1, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, p1, count); \ @@ -299,8 +299,8 @@ objptr->methname ## ResponseValues.add(rv, (type1&)p1, (type2&)p2, count); \ } \ \ - void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, p1, p2, count); \ @@ -313,9 +313,9 @@ objptr->methname ## ResponseValues.add(rv, (type1&)p1, (type2&)p2, (type3&)p3, count); \ } \ \ - void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, \ - const mockpp::ConstraintHolder<type3> &p3, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, \ + const mockpp::ConstraintHolder< type3 > &p3, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, p1, p2, p3, count); \ @@ -328,10 +328,10 @@ objptr->methname ## ResponseValues.add(rv, (type1 &)p1, (type2 &)p2, (type3 &)p3, (type4 &)p4, count); \ } \ \ - void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, \ - const mockpp::ConstraintHolder<type3> &p3, \ - const mockpp::ConstraintHolder<type4> &p4, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, \ + const mockpp::ConstraintHolder< type3 > &p3, \ + const mockpp::ConstraintHolder< type4 > &p4, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, p1, p2, p3, p4, count); \ @@ -344,11 +344,11 @@ objptr->methname ## ResponseValues.add(rv, (type1)p1, (type2)p2, (type3)p3, (type4)p4, (type5)p5, count); \ } \ \ - void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, \ - const mockpp::ConstraintHolder<type3> &p3, \ - const mockpp::ConstraintHolder<type4> &p4, \ - const mockpp::ConstraintHolder<type5> &p5, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseValue(const ret_type &rv, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, \ + const mockpp::ConstraintHolder< type3 > &p3, \ + const mockpp::ConstraintHolder< type4 > &p4, \ + const mockpp::ConstraintHolder< type5 > &p5, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(rv, p1, p2, p3, p4, p5, count); \ @@ -365,7 +365,7 @@ objptr->methname ## ResponseValues.add(t, (type1&)p1, count); \ } \ \ - void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder< type1 > &p1, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, count); \ @@ -378,8 +378,8 @@ objptr->methname ## ResponseValues.add(t, (type1&)p1, (type2&)p2, count); \ } \ \ - void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, p2, count); \ @@ -392,9 +392,9 @@ objptr->methname ## ResponseValues.add(t, (type1 &)p1, (type2&)p2, (type3&)p3, count); \ } \ \ - void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, \ - const mockpp::ConstraintHolder<type3> &p3, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, \ + const mockpp::ConstraintHolder< type3 > &p3, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, p2, p3, count); \ @@ -407,10 +407,10 @@ objptr->methname ## ResponseValues.add(t, (type1 &)p1, (type2 &)p2, (type3 &)p3, (type4 &)p4, count); \ } \ \ - void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, \ - const mockpp::ConstraintHolder<type3> &p3, \ - const mockpp::ConstraintHolder<type4> &p4, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, \ + const mockpp::ConstraintHolder< type3 > &p3, \ + const mockpp::ConstraintHolder< type4 > &p4, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, p2, p3, p4, count); \ @@ -423,11 +423,11 @@ objptr->methname ## ResponseValues.add(t, (type1)p1, (type2)p2, (type3)p3, (type4)p4, (type5)p5, count); \ } \ \ - void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder<type1> &p1, \ - const mockpp::ConstraintHolder<type2> &p2, \ - const mockpp::ConstraintHolder<type3> &p3, \ - const mockpp::ConstraintHolder<type4> &p4, \ - const mockpp::ConstraintHolder<type5> &p5, unsigned count = MOCKPP_UNLIMITED) \ + void addResponseThrowable(mockpp::Throwable *t, const mockpp::ConstraintHolder< type1 > &p1, \ + const mockpp::ConstraintHolder< type2 > &p2, \ + const mockpp::ConstraintHolder< type3 > &p3, \ + const mockpp::ConstraintHolder< type4 > &p4, \ + const mockpp::ConstraintHolder< type5 > &p5, unsigned count = MOCKPP_UNLIMITED) \ { \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## ResponseValues.add(t, p1, p2, p3, p4, p5, count); \ @@ -591,33 +591,33 @@ mutable std::vector<bool> name ## ThrowableInsteadReturn #define MOCKPP_DECLARE_RETURN_VARS(ret_type, name) \ - mutable mockpp::ReturnObjectList<ret_type> name ## ReturnValues; \ - bool name ## haveDefaultReturnValue; \ - mutable bool name ## DefaultReturnValueUsed; \ - ret_type name ## DefaultReturnValue + mutable mockpp::ReturnObjectList< ret_type > name ## ReturnValues; \ + bool name ## haveDefaultReturnValue; \ + mutable bool name ## DefaultReturnValueUsed; \ + ret_type name ## DefaultReturnValue //////////////////////////////////////////////////////////////////////////// // #define MOCKPP_DECLARE_PARAMETER_VARS1(name, type1) \ - mutable mockpp::ConstraintList<type1> name ## Parameter1 + mutable mockpp::ConstraintList< type1 > name ## Parameter1 #define MOCKPP_DECLARE_PARAMETER_VARS2(name, type1, type2) \ MOCKPP_DECLARE_PARAMETER_VARS1(name, type1); \ - mutable mockpp::ConstraintList<type2> name ## Parameter2 + mutable mockpp::ConstraintList< type2 > name ## Parameter2 #define MOCKPP_DECLARE_PARAMETER_VARS3(name, type1, type2, type3) \ MOCKPP_DECLARE_PARAMETER_VARS2(name, type1, type2); \ - mutable mockpp::ConstraintList<type3> name ## Parameter3 + mutable mockpp::ConstraintList< type3 > name ## Parameter3 #define MOCKPP_DECLARE_PARAMETER_VARS4(name, type1, type2, type3, type4) \ MOCKPP_DECLARE_PARAMETER_VARS3(name, type1, type2, type3); \ - mutable mockpp::ConstraintList<type4> name ## Parameter4 + mutable mockpp::ConstraintList< type4 > name ## Parameter4 #define MOCKPP_DECLARE_PARAMETER_VARS5(name, type1, type2, type3, type4, type5) \ MOCKPP_DECLARE_PARAMETER_VARS4(name, type1, type2, type3, type4); \ - mutable mockpp::ConstraintList<type5> name ## Parameter5 + mutable mockpp::ConstraintList< type5 > name ## Parameter5 //////////////////////////////////////////////////////////////////////////// // @@ -742,14 +742,14 @@ } \ } \ \ - void a_name (const mockpp::ConstraintHolder<v_type1> ¶m1) /* @todo const? */ \ + void a_name (const mockpp::ConstraintHolder< v_type1 > ¶m1) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ - mutable mockpp::ResponseThrowableVector1<v_type1> m_name ## ResponseValues; \ + mutable mockpp::ResponseThrowableVector1< v_type1 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS1(m_name, v_type1); \ MOCKPP_VOID_CONTROLLER_DECL1(classname, m_name, v_type1) @@ -795,8 +795,8 @@ } \ } \ \ - void a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2) /* @todo const? */ \ + void a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -804,7 +804,7 @@ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ - mutable mockpp::ResponseThrowableVector2<v_type1, v_type2> m_name ## ResponseValues; \ + mutable mockpp::ResponseThrowableVector2< v_type1, v_type2 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS2(m_name, v_type1, v_type2); \ MOCKPP_VOID_CONTROLLER_DECL2(classname, m_name, v_type1, v_type2) @@ -855,9 +855,9 @@ } \ } \ \ - void a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2, \ - const mockpp::ConstraintHolder<v_type3> ¶m3) /* @todo const? */ \ + void a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2, \ + const mockpp::ConstraintHolder< v_type3 > ¶m3) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -866,7 +866,7 @@ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ - mutable mockpp::ResponseThrowableVector3<v_type1, v_type2, v_type3> m_name ## ResponseValues; \ + mutable mockpp::ResponseThrowableVector3< v_type1, v_type2, v_type3 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS3(m_name, v_type1, v_type2, v_type3); \ MOCKPP_VOID_CONTROLLER_DECL3(classname, m_name, v_type1, v_type2, v_type3) @@ -922,10 +922,10 @@ } \ } \ \ - void a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2, \ - const mockpp::ConstraintHolder<v_type3> ¶m3, \ - const mockpp::ConstraintHolder<v_type4> ¶m4) /* @todo const? */ \ + void a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2, \ + const mockpp::ConstraintHolder< v_type3 > ¶m3, \ + const mockpp::ConstraintHolder< v_type4 > ¶m4) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -935,7 +935,7 @@ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ - mutable mockpp::ResponseThrowableVector4<v_type1, v_type2, v_type3, v_type4> m_name ## ResponseValues; \ + mutable mockpp::ResponseThrowableVector4< v_type1, v_type2, v_type3, v_type4 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS4(m_name, v_type1, v_type2, v_type3, v_type4); \ MOCKPP_VOID_CONTROLLER_DECL4(classname, m_name, v_type1, v_type2, v_type3, v_type4) @@ -996,11 +996,11 @@ } \ } \ \ - void a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2, \ - const mockpp::ConstraintHolder<v_type3> ¶m3, \ - const mockpp::ConstraintHolder<v_type4> ¶m4, \ - const mockpp::ConstraintHolder<v_type5> ¶m5) /* @todo const? */ \ + void a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2, \ + const mockpp::ConstraintHolder< v_type3 > ¶m3, \ + const mockpp::ConstraintHolder< v_type4 > ¶m4, \ + const mockpp::ConstraintHolder< v_type5 > ¶m5) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -1011,7 +1011,7 @@ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ - mutable mockpp::ResponseThrowableVector5<v_type1, v_type2, v_type3, v_type4, v_type5> m_name ## ResponseValues; \ + mutable mockpp::ResponseThrowableVector5< v_type1, v_type2, v_type3, v_type4, v_type5 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS5(m_name, v_type1, v_type2, v_type3, v_type4, v_type5); \ MOCKPP_VOID_CONTROLLER_DECL5(classname, m_name, v_type1, v_type2, v_type3, v_type4, v_type5) @@ -1100,7 +1100,7 @@ } \ } \ \ - m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1) /* @todo const? */ \ + m_ret_type a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -1109,7 +1109,7 @@ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ MOCKPP_DECLARE_RETURN_VARS(v_ret_type, m_name); \ - mutable mockpp::ResponseVector1<v_ret_type, v_type1> m_name ## ResponseValues; \ + mutable mockpp::ResponseVector1< v_ret_type, v_type1 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS1(m_name, v_type1); \ MOCKPP_CONTROLLER_DECL1(classname, v_ret_type, m_name, v_type1) @@ -1166,8 +1166,8 @@ } \ } \ \ - m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2) /* @todo const? */ \ + m_ret_type a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -1177,7 +1177,7 @@ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ MOCKPP_DECLARE_RETURN_VARS(v_ret_type, m_name); \ - mutable mockpp::ResponseVector2<v_ret_type, v_type1, v_type2> m_name ## ResponseValues; \ + mutable mockpp::ResponseVector2< v_ret_type, v_type1, v_type2 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS2(m_name, v_type1, v_type2); \ MOCKPP_CONTROLLER_DECL2(classname, v_ret_type, m_name, v_type1, v_type2) @@ -1239,9 +1239,9 @@ } \ } \ \ - m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2, \ - const mockpp::ConstraintHolder<v_type3> ¶m3) /* @todo const? */ \ + m_ret_type a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2, \ + const mockpp::ConstraintHolder< v_type3 > ¶m3) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -1252,7 +1252,7 @@ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ MOCKPP_DECLARE_RETURN_VARS(v_ret_type, m_name); \ - mutable mockpp::ResponseVector3<v_ret_type, v_type1, v_type2, v_type3> m_name ## ResponseValues; \ + mutable mockpp::ResponseVector3< v_ret_type, v_type1, v_type2, v_type3 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS3(m_name, v_type1, v_type2, v_type3); \ MOCKPP_CONTROLLER_DECL3(classname, v_ret_type, m_name, v_type1, v_type2, v_type3) @@ -1318,10 +1318,10 @@ } \ } \ \ - m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2, \ - const mockpp::ConstraintHolder<v_type3> ¶m3, \ - const mockpp::ConstraintHolder<v_type4> ¶m4) /* @todo const? */ \ + m_ret_type a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2, \ + const mockpp::ConstraintHolder< v_type3 > ¶m3, \ + const mockpp::ConstraintHolder< v_type4 > ¶m4) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -1333,7 +1333,7 @@ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ MOCKPP_DECLARE_RETURN_VARS(v_ret_type, m_name); \ - mutable mockpp::ResponseVector4<v_ret_type, v_type1, v_type2, v_type3, v_type4> m_name ## ResponseValues; \ + mutable mockpp::ResponseVector4< v_ret_type, v_type1, v_type2, v_type3, v_type4 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS4(m_name, v_type1, v_type2, v_type3, v_type4); \ MOCKPP_CONTROLLER_DECL4(classname, v_ret_type, m_name, v_type1, v_type2, v_type3, v_type4) @@ -1404,11 +1404,11 @@ } \ } \ \ - m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1, \ - const mockpp::ConstraintHolder<v_type2> ¶m2, \ - const mockpp::ConstraintHolder<v_type3> ¶m3, \ - const mockpp::ConstraintHolder<v_type4> ¶m4, \ - const mockpp::ConstraintHolder<v_type5> ¶m5) /* @todo const? */ \ + m_ret_type a_name(const mockpp::ConstraintHolder< v_type1 > ¶m1, \ + const mockpp::ConstraintHolder< v_type2 > ¶m2, \ + const mockpp::ConstraintHolder< v_type3 > ¶m3, \ + const mockpp::ConstraintHolder< v_type4 > ¶m4, \ + const mockpp::ConstraintHolder< v_type5 > ¶m5) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ m_name ## Parameter1.addExpected(param1); \ @@ -1421,7 +1421,7 @@ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ MOCKPP_DECLARE_RETURN_VARS(v_ret_type, m_name); \ - mutable mockpp::ResponseVector5<v_ret_type, v_type1, v_type2, v_type3, v_type4, v_type5> m_name ## ResponseValues; \ + mutable mockpp::ResponseVector5< v_ret_type, v_type1, v_type2, v_type3, v_type4, v_type5 > m_name ## ResponseValues; \ MOCKPP_DECLARE_PARAMETER_VARS5(m_name, v_type1, v_type2, v_type3, v_type4, v_type5); \ MOCKPP_CONTROLLER_DECL5(classname, v_ret_type, m_name, v_type1, v_type2, v_type3, v_type4, v_type5) |