[Mockpp-commits] mockpp/mockpp VisitableMockObject_macro.h,1.30,1.31 VisitableMockObject_template.h,
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp VisitableMockObject_macro.h,1.30,1.31 VisitableMockObject_template.h,1.25,1.26
|
From: Ewald A. <ewa...@us...> - 2005-07-31 14:23:11
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12866/mockpp Modified Files: VisitableMockObject_macro.h VisitableMockObject_template.h Log Message: fixed compilation problems on certain data types Index: VisitableMockObject_template.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_template.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- VisitableMockObject_template.h 7 May 2005 12:45:11 -0000 1.25 +++ VisitableMockObject_template.h 31 Jul 2005 14:22:57 -0000 1.26 @@ -121,7 +121,7 @@ * @param c1 the constraint upon which to return * @param count the number of times the object may be used */ - void add(Throwable *t, const mockpp::ConstraintHolder<T1> &c1, unsigned count) + void add(Throwable *t, const ConstraintHolder<T1> &c1, unsigned count) { counter.push_back(count); tvec.push_back(t); @@ -136,7 +136,8 @@ */ void add(Throwable *t, const T1 &t1, unsigned count) { - add(t, new IsEqual<T1>(t1), count); + const ConstraintHolder<T1> h1 = new IsEqual<T1>(t1); + add(t, h1, count); } /** Removes all the objects from the list. @@ -219,7 +220,7 @@ * @param c1 the constraint upon which to return * @param count the number of times the object may be used */ - void add(Throwable *t, const mockpp::ConstraintHolder<T1> &c1, unsigned count) + void add(Throwable *t, const ConstraintHolder<T1> &c1, unsigned count) { MOCKPP_ASSERT_TRUE(t != 0); ResponseThrowableVector1<T1>::add (t, c1, count); @@ -243,7 +244,7 @@ * @param c1 the constraint upon which to return * @param count the number of times the object may be used */ - void add(const R &r, const mockpp::ConstraintHolder<T1> &c1, unsigned count) + void add(const R &r, const ConstraintHolder<T1> &c1, unsigned count) { ResponseThrowableVector1<T1>::add ((Throwable*)0, c1, count); rvec.push_back(r); @@ -331,8 +332,8 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, unsigned count) { counter.push_back(count); @@ -351,10 +352,9 @@ */ void add(Throwable *t, const T1 &t1, const T2 &t2, unsigned count) { - add(t, - new IsEqual<T1>(t1), - new IsEqual<T2>(t2), - count); + const ConstraintHolder<T1> h1 = new IsEqual<T1>(t1); + const ConstraintHolder<T2> h2 = new IsEqual<T2>(t2); + add(t, h1, h2, count); } /** Removes all the objects from the list. @@ -447,8 +447,8 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, unsigned count) { MOCKPP_ASSERT_TRUE(t != 0); @@ -464,8 +464,8 @@ * @param count the number of times the object may be used */ void add(const R &r, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, unsigned count) { ResponseThrowableVector2<T1, T2>::add((Throwable*)0, c1, c2, count); @@ -571,11 +571,10 @@ */ void add(Throwable *t, const T1 &t1, const T2 &t2, const T3 &t3, unsigned count) { - add(t, - new IsEqual<T1>(t1), - new IsEqual<T2>(t2), - new IsEqual<T3>(t3), - count); + const ConstraintHolder<T1> h1 = new IsEqual<T1>(t1); + const ConstraintHolder<T2> h2 = new IsEqual<T2>(t2); + const ConstraintHolder<T3> h3 = new IsEqual<T3>(t3); + add(t, h1, h2, h3, count); } /** Adds a throwable. @@ -586,9 +585,9 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, unsigned count) { counter.push_back(count); @@ -699,9 +698,9 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, unsigned count) { MOCKPP_ASSERT_TRUE(t != 0); @@ -731,9 +730,9 @@ * @param count the number of times the object may be used */ void add(const R &r, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, unsigned count) { ResponseThrowableVector3<T1, T2, T3>::add((Throwable*)0, c1, c2, c3, count); @@ -830,12 +829,11 @@ */ void add(Throwable *t, const T1 &t1, const T2 &t2, const T3 &t3, const T4 &t4, unsigned count) { - add(t, - new IsEqual<T1>(t1), - new IsEqual<T2>(t2), - new IsEqual<T3>(t3), - new IsEqual<T4>(t4), - count); + const ConstraintHolder<T1> h1 = new IsEqual<T1>(t1); + const ConstraintHolder<T2> h2 = new IsEqual<T2>(t2); + const ConstraintHolder<T3> h3 = new IsEqual<T3>(t3); + const ConstraintHolder<T4> h4 = new IsEqual<T4>(t4); + add(t, h1, h2, h3, h4, count); } /** Adds a throwable. @@ -847,10 +845,10 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, - const mockpp::ConstraintHolder<T4> &c4, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, + const ConstraintHolder<T4> &c4, unsigned count) { counter.push_back(count); @@ -969,10 +967,10 @@ * @param count the number of times the object may be used */ void add(const R &r, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, - const mockpp::ConstraintHolder<T4> &c4, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, + const ConstraintHolder<T4> &c4, unsigned count) { ResponseThrowableVector4<T1, T2, T3, T4>::add((Throwable*)0, c1, c2, c3, c4, count); @@ -1004,10 +1002,10 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, - const mockpp::ConstraintHolder<T4> &c4, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, + const ConstraintHolder<T4> &c4, unsigned count) { MOCKPP_ASSERT_TRUE(t != 0); @@ -1111,13 +1109,12 @@ */ void add(Throwable *t, const T1 &t1, const T2 &t2, const T3 &t3, const T4 &t4, const T5 &t5, unsigned count) { - add(t, - new IsEqual<T1>(t1), - new IsEqual<T2>(t2), - new IsEqual<T3>(t3), - new IsEqual<T4>(t4), - new IsEqual<T5>(t5), - count); + const ConstraintHolder<T1> h1 = new IsEqual<T1>(t1); + const ConstraintHolder<T2> h2 = new IsEqual<T2>(t2); + const ConstraintHolder<T3> h3 = new IsEqual<T3>(t3); + const ConstraintHolder<T4> h4 = new IsEqual<T4>(t4); + const ConstraintHolder<T5> h5 = new IsEqual<T5>(t5); + add(t, h1, h2, h3, h4, h5, count); } /** Adds a throwable. @@ -1130,11 +1127,11 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, - const mockpp::ConstraintHolder<T4> &c4, - const mockpp::ConstraintHolder<T5> &c5, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, + const ConstraintHolder<T4> &c4, + const ConstraintHolder<T5> &c5, unsigned count) { counter.push_back(count); @@ -1265,11 +1262,11 @@ * @param count the number of times the object may be used */ void add(Throwable *t, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, - const mockpp::ConstraintHolder<T4> &c4, - const mockpp::ConstraintHolder<T5> &c5, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, + const ConstraintHolder<T4> &c4, + const ConstraintHolder<T5> &c5, unsigned count) { MOCKPP_ASSERT_TRUE(t != 0); @@ -1303,11 +1300,11 @@ * @param count the number of times the object may be used */ void add(const R &r, - const mockpp::ConstraintHolder<T1> &c1, - const mockpp::ConstraintHolder<T2> &c2, - const mockpp::ConstraintHolder<T3> &c3, - const mockpp::ConstraintHolder<T4> &c4, - const mockpp::ConstraintHolder<T5> &c5, + const ConstraintHolder<T1> &c1, + const ConstraintHolder<T2> &c2, + const ConstraintHolder<T3> &c3, + const ConstraintHolder<T4> &c4, + const ConstraintHolder<T5> &c5, unsigned count) { ResponseThrowableVector5<T1, T2, T3, T4, T5>::add((Throwable*)0, c1, c2, c3, c4, c5, count); Index: VisitableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_macro.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- VisitableMockObject_macro.h 23 Jul 2005 13:30:49 -0000 1.30 +++ VisitableMockObject_macro.h 31 Jul 2005 14:22:57 -0000 1.31 @@ -745,8 +745,7 @@ void a_name (const mockpp::ConstraintHolder<v_type1> ¶m1) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - m_name ## Parameter1.addExpected(cons1.release()); \ + m_name ## Parameter1.addExpected(param1); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ @@ -800,10 +799,8 @@ const mockpp::ConstraintHolder<v_type2> ¶m2) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ @@ -863,12 +860,9 @@ const mockpp::ConstraintHolder<v_type3> ¶m3) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - mockpp::Constraint<v_type3>::AP cons3 (param3); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ - m_name ## Parameter3.addExpected(cons3.release()); \ + 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); \ @@ -934,14 +928,10 @@ const mockpp::ConstraintHolder<v_type4> ¶m4) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - mockpp::Constraint<v_type3>::AP cons3 (param3); \ - mockpp::Constraint<v_type4>::AP cons4 (param4); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ - m_name ## Parameter3.addExpected(cons3.release()); \ - m_name ## Parameter4.addExpected(cons4.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ + m_name ## Parameter3.addExpected(param3); \ + m_name ## Parameter4.addExpected(param4); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ @@ -1013,16 +1003,11 @@ const mockpp::ConstraintHolder<v_type5> ¶m5) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - mockpp::Constraint<v_type3>::AP cons3 (param3); \ - mockpp::Constraint<v_type4>::AP cons4 (param4); \ - mockpp::Constraint<v_type5>::AP cons5 (param5); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ - m_name ## Parameter3.addExpected(cons3.release()); \ - m_name ## Parameter4.addExpected(cons4.release()); \ - m_name ## Parameter5.addExpected(cons5.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ + m_name ## Parameter3.addExpected(param3); \ + m_name ## Parameter4.addExpected(param4); \ + m_name ## Parameter5.addExpected(param5); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ MOCKPP_DECLARE_DEFAULT_VARS(m_name); \ @@ -1118,8 +1103,7 @@ m_ret_type a_name(const mockpp::ConstraintHolder<v_type1> ¶m1) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - m_name ## Parameter1.addExpected(cons1.release()); \ + m_name ## Parameter1.addExpected(param1); \ return v_ret_type(); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -1186,10 +1170,8 @@ const mockpp::ConstraintHolder<v_type2> ¶m2) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ return v_ret_type(); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -1262,12 +1244,9 @@ const mockpp::ConstraintHolder<v_type3> ¶m3) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - mockpp::Constraint<v_type3>::AP cons3 (param3); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ - m_name ## Parameter3.addExpected(cons3.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ + m_name ## Parameter3.addExpected(param3); \ return v_ret_type(); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -1345,14 +1324,10 @@ const mockpp::ConstraintHolder<v_type4> ¶m4) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - mockpp::Constraint<v_type3>::AP cons3 (param3); \ - mockpp::Constraint<v_type4>::AP cons4 (param4); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ - m_name ## Parameter3.addExpected(cons3.release()); \ - m_name ## Parameter4.addExpected(cons4.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ + m_name ## Parameter3.addExpected(param3); \ + m_name ## Parameter4.addExpected(param4); \ return v_ret_type(); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ @@ -1436,16 +1411,11 @@ const mockpp::ConstraintHolder<v_type5> ¶m5) /* @todo const? */ \ { \ addExpectedMethod(mockpp::getLatin1(getVerifiableName()) + "." + #m_name); \ - mockpp::Constraint<v_type1>::AP cons1 (param1); \ - mockpp::Constraint<v_type2>::AP cons2 (param2); \ - mockpp::Constraint<v_type3>::AP cons3 (param3); \ - mockpp::Constraint<v_type4>::AP cons4 (param4); \ - mockpp::Constraint<v_type5>::AP cons5 (param5); \ - m_name ## Parameter1.addExpected(cons1.release()); \ - m_name ## Parameter2.addExpected(cons2.release()); \ - m_name ## Parameter3.addExpected(cons3.release()); \ - m_name ## Parameter4.addExpected(cons4.release()); \ - m_name ## Parameter5.addExpected(cons5.release()); \ + m_name ## Parameter1.addExpected(param1); \ + m_name ## Parameter2.addExpected(param2); \ + m_name ## Parameter3.addExpected(param3); \ + m_name ## Parameter4.addExpected(param4); \ + m_name ## Parameter5.addExpected(param5); \ return v_ret_type(); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ |
