diff -r bafcc3c3538f -r 30d2be004032 sourcehook/test/testhookmangen.hxx --- a/sourcehook/test/testhookmangen.hxx Fri Nov 02 11:59:57 2007 +0000 +++ b/sourcehook/test/testhookmangen.hxx Fri Nov 02 12:41:00 2007 +0000 @@ -260,6 +260,7 @@ #define THGM_MAKE_TEST$1(id, ret_type@[$2,1,$1:, param$2@]) \ struct TestClass##id; \ + typedef ret_type RetType##id; \ typedef ParamState$1<0@[$2,1,$1:, param$2@] > ParamState_m##id; \ MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \ MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \ @@ -497,10 +498,21 @@ THGM_REMOVE_HOOK(id, 3); \ THGM_REMOVE_HOOK(id, 4); +template +T ComparableRef(T x) +{ + return x; +} + +template +T* ComparableRef(T& x) +{ + return &x; +} #define THGM_CALLS(id, call_params, exp_ret_norm, exp_ret_shcall, err) \ - CHECK_COND(pTest##id->Func call_params == exp_ret_norm, err " /retcallnorm"); \ - CHECK_COND(SH_CALL(pTest##id, &TestClass##id::Func) call_params == exp_ret_shcall, err " /retcallshcall"); + CHECK_COND(ComparableRef(pTest##id->Func call_params) == ComparableRef(MakeRet< RetType##id >::Do(exp_ret_norm)), err " /retcallnorm"); \ + CHECK_COND(ComparableRef(SH_CALL(pTest##id, &TestClass##id::Func) call_params) == ComparableRef(MakeRet< RetType##id >::Do(exp_ret_shcall)), err " /retcallshcall"); #define THGM_DO_TEST(id, call_params) \ setuppi_##id(); \