Thread: [Mockpp-commits] mockpp/mockpp/chaining ChainableMockObject_macro.h,1.12,1.13
Brought to you by:
ewald-arnold
Menu
▾
▴
mockpp-commits
|
From: Ewald A. <ewa...@us...> - 2005-09-19 18:33:48
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21952/mockpp/chaining Modified Files: ChainableMockObject_macro.h Log Message: add spaces to enable templates as macros Index: ChainableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainableMockObject_macro.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChainableMockObject_macro.h 24 Jul 2005 12:54:00 -0000 1.12 +++ ChainableMockObject_macro.h 19 Sep 2005 18:33:40 -0000 1.13 @@ -48,13 +48,13 @@ #define MOCKPP_CHAINER_DECL_START(classname, methname, ArgCount, ReturnType, InvocationType) \ friend class ChainerFor ## methname; \ public: \ - class ChainerFor ## methname : public mockpp::ChainingMockBuilder<mockpp::ArgumentsMatchBuilder ## ArgCount<ReturnType, InvocationType> >\ + class ChainerFor ## methname : public mockpp::ChainingMockBuilder<mockpp::ArgumentsMatchBuilder ## ArgCount< ReturnType, InvocationType > >\ { \ \ public: \ \ ChainerFor ## methname(classname *cls) \ - : mockpp::ChainingMockBuilder<mockpp::ArgumentsMatchBuilder ## ArgCount<ReturnType, InvocationType> >(&cls->methname ## CoreMock, cls, MOCKPP_PCHAR("ChainerFor") MOCKPP_PCHAR(# methname), cls) \ + : mockpp::ChainingMockBuilder<mockpp::ArgumentsMatchBuilder ## ArgCount< ReturnType, InvocationType > >(&cls->methname ## CoreMock, cls, MOCKPP_PCHAR("ChainerFor") MOCKPP_PCHAR(# methname), cls) \ { \ } \ \ @@ -106,7 +106,7 @@ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ typedef mockpp::Invocation0 m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType> m_name ## CoreMock; \ + mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL0(classname, m_name, void, m_name ## InvocationType) @@ -121,12 +121,12 @@ a_name, v_type1) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ + mockpp::Invocation1< v_type1 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation1<v_type1> m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType> m_name ## CoreMock; \ + typedef mockpp::Invocation1< v_type1 > m_name ## InvocationType; \ + mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL1(classname, m_name, void, m_name ## InvocationType) @@ -141,12 +141,12 @@ a_name, v_type1, v_type2) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation2<v_type1, v_type2> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2); \ + mockpp::Invocation2< v_type1, v_type2 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation2<v_type1, v_type2> m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType> m_name ## CoreMock; \ + typedef mockpp::Invocation2< v_type1, v_type2 > m_name ## InvocationType; \ + mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL2(classname, m_name, void, m_name ## InvocationType) @@ -165,12 +165,12 @@ a_name, v_type1, v_type2, v_type3) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation3<v_type1, v_type2, v_type3> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3); \ + mockpp::Invocation3< v_type1, v_type2, v_type3 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation3<v_type1, v_type2, v_type3> m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType> m_name ## CoreMock; \ + typedef mockpp::Invocation3< v_type1, v_type2, v_type3 > m_name ## InvocationType; \ + mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL3(classname, m_name, void, m_name ## InvocationType) @@ -191,12 +191,12 @@ a_name, v_type1, v_type2, v_type3, v_type4) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4); \ + mockpp::Invocation4< v_type1, v_type2, v_type3, v_type4 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType> m_name ## CoreMock; \ + typedef mockpp::Invocation4< v_type1, v_type2, v_type3, v_type4 > m_name ## InvocationType; \ + mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL4(classname, m_name, void, m_name ## InvocationType) @@ -219,12 +219,12 @@ a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4, (v_type5&)param5); \ + mockpp::Invocation5< v_type1, v_type2, v_type3, v_type4, v_type5 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4, (v_type5&)param5); \ m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> m_name ## InvocationType; \ - mutable mockpp::CoreMock<void, m_name ## InvocationType> m_name ## CoreMock; \ + typedef mockpp::Invocation5< v_type1, v_type2, v_type3, v_type4, v_type5 > m_name ## InvocationType; \ + mutable mockpp::CoreMock<void, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL5(classname, m_name, void, m_name ## InvocationType) //////////////////////////////////////////////////////////////////////////// @@ -245,7 +245,7 @@ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ typedef mockpp::Invocation0 m_name ## InvocationType; \ - mutable mockpp::CoreMock<m_ret_type, m_name ## InvocationType> m_name ## CoreMock; \ + mutable mockpp::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL0(classname, m_name, m_ret_type, m_name ## InvocationType) @@ -262,12 +262,12 @@ v_ret_type, a_name, v_type1) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation1<v_type1> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ + mockpp::Invocation1< v_type1 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation1<v_type1> m_name ## InvocationType; \ - mutable mockpp::CoreMock<m_ret_type, m_name ## InvocationType> m_name ## CoreMock; \ + typedef mockpp::Invocation1< v_type1 > m_name ## InvocationType; \ + mutable mockpp::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL1(classname, m_name, m_ret_type, m_name ## InvocationType) @@ -284,12 +284,12 @@ v_ret_type, a_name, v_type1, v_type2) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation2<v_type1, v_type2> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2); \ + mockpp::Invocation2< v_type1, v_type2 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation2<v_type1, v_type2> m_name ## InvocationType; \ - mutable mockpp::CoreMock<m_ret_type, m_name ## InvocationType> m_name ## CoreMock; \ + typedef mockpp::Invocation2< v_type1, v_type2 > m_name ## InvocationType; \ + mutable mockpp::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL2(classname, m_name, m_ret_type, m_name ## InvocationType) @@ -310,12 +310,12 @@ v_ret_type, a_name, v_type1, v_type2, v_type3) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation3<v_type1, v_type2, v_type3> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3); \ + mockpp::Invocation3< v_type1, v_type2, v_type3 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation3<v_type1, v_type2, v_type3> m_name ## InvocationType; \ - mutable mockpp::CoreMock<m_ret_type, m_name ## InvocationType> m_name ## CoreMock; \ + typedef mockpp::Invocation3< v_type1, v_type2, v_type3 > m_name ## InvocationType; \ + mutable mockpp::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL3(classname, m_name, m_ret_type, m_name ## InvocationType) @@ -338,12 +338,12 @@ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4); \ + mockpp::Invocation4< v_type1, v_type2, v_type3, v_type4 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation4<v_type1, v_type2, v_type3, v_type4> m_name ## InvocationType; \ - mutable mockpp::CoreMock<m_ret_type, m_name ## InvocationType> m_name ## CoreMock; \ + typedef mockpp::Invocation4< v_type1, v_type2, v_type3, v_type4 > m_name ## InvocationType; \ + mutable mockpp::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL4(classname, m_name, m_ret_type, m_name ## InvocationType) @@ -368,12 +368,12 @@ v_ret_type, a_name, v_type1, v_type2, v_type3, v_type4, v_type5) \ { \ std::string func_name (#m_name); \ - mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4, (v_type5&)param5); \ + mockpp::Invocation5< v_type1, v_type2, v_type3, v_type4, v_type5 > inv(getVerifiableName() + MOCKPP_PCHAR(".") MOCKPP_PCHAR(#m_name), (v_type1&)param1, (v_type2&)param2, (v_type3&)param3, (v_type4&)param4, (v_type5&)param5); \ return m_name ## CoreMock.invoke(inv); \ } \ MOCKPP_MEMBER_RESTRICTOR_PRIVATE: \ - typedef mockpp::Invocation5<v_type1, v_type2, v_type3, v_type4, v_type5> m_name ## InvocationType; \ - mutable mockpp::CoreMock<m_ret_type, m_name ## InvocationType> m_name ## CoreMock; \ + typedef mockpp::Invocation5< v_type1, v_type2, v_type3, v_type4, v_type5 > m_name ## InvocationType; \ + mutable mockpp::CoreMock< m_ret_type, m_name ## InvocationType > m_name ## CoreMock; \ MOCKPP_CHAINER_DECL5(classname, m_name, m_ret_type, m_name ## InvocationType) |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X