1.1 --- a/sourcehook/test/testhookmangen.hxx Fri Nov 02 11:59:57 2007 +0000
1.2 +++ b/sourcehook/test/testhookmangen.hxx Fri Nov 02 12:41:00 2007 +0000
1.3 @@ -260,6 +260,7 @@
1.4
1.5 #define THGM_MAKE_TEST$1(id, ret_type@[$2,1,$1:, param$2@]) \
1.6 struct TestClass##id; \
1.7 + typedef ret_type RetType##id; \
1.8 typedef ParamState$1<0@[$2,1,$1:, param$2@] > ParamState_m##id; \
1.9 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
1.10 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
1.11 @@ -497,10 +498,21 @@
1.12 THGM_REMOVE_HOOK(id, 3); \
1.13 THGM_REMOVE_HOOK(id, 4);
1.14
1.15 +template<class T>
1.16 +T ComparableRef(T x)
1.17 +{
1.18 + return x;
1.19 +}
1.20 +
1.21 +template <class T>
1.22 +T* ComparableRef(T& x)
1.23 +{
1.24 + return &x;
1.25 +}
1.26
1.27 #define THGM_CALLS(id, call_params, exp_ret_norm, exp_ret_shcall, err) \
1.28 - CHECK_COND(pTest##id->Func call_params == exp_ret_norm, err " /retcallnorm"); \
1.29 - CHECK_COND(SH_CALL(pTest##id, &TestClass##id::Func) call_params == exp_ret_shcall, err " /retcallshcall");
1.30 + CHECK_COND(ComparableRef<RetType##id>(pTest##id->Func call_params) == ComparableRef<RetType##id>(MakeRet< RetType##id >::Do(exp_ret_norm)), err " /retcallnorm"); \
1.31 + CHECK_COND(ComparableRef<RetType##id>(SH_CALL(pTest##id, &TestClass##id::Func) call_params) == ComparableRef<RetType##id>(MakeRet< RetType##id >::Do(exp_ret_shcall)), err " /retcallshcall");
1.32
1.33 #define THGM_DO_TEST(id, call_params) \
1.34 setuppi_##id(); \