diff -r 41f21d77c3c1 -r 89cf494f6088 sourcehook/test/testhookmangen.hxx --- a/sourcehook/test/testhookmangen.hxx Thu Nov 01 17:29:39 2007 +0000 +++ b/sourcehook/test/testhookmangen.hxx Fri Nov 02 00:53:32 2007 +0000 @@ -29,6 +29,11 @@ { reinterpret_cast(this)->~T(); } + + const T& AssignOp(const T &other) + { + return (*reinterpret_cast(this) = other); + } }; @@ -99,7 +104,7 @@ { static POD Do(int a) { - POD x; + POD x; memset(reinterpret_cast(x.x), a, SIZE); return x; } @@ -272,7 +277,7 @@ ADD_STATE(State_Func##id(this, ParamState_m##id(@[$2,1,$1|, :p$2@]))); \ g_Inside_LeafFunc = false; \ \ - return MakeRet::Do(0); \ + return MakeRet< ret_type >::Do(0); \ } \ \ struct Delegate1 : public MyDelegate \ @@ -285,10 +290,10 @@ if (ms_DoRecall) \ { \ @[$2,1,$1:Increment::type>::Incr(p$2);@] \ - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet::Do(1), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \ + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(1), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \ } \ else \ - RETURN_META_VALUE(MRES_IGNORED, MakeRet::Do(1)); \ + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(1)); \ } \ }; \ struct Delegate2 : public MyDelegate \ @@ -301,10 +306,10 @@ if (ms_DoRecall) \ { \ @[$2,1,$1:Increment::type>::Incr(p$2);@] \ - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet::Do(2), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \ + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \ } \ else \ - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet::Do(2)); \ + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2)); \ } \ }; \ struct Delegate3 : public MyDelegate \ @@ -317,10 +322,10 @@ if (ms_DoRecall) \ { \ @[$2,1,$1:Increment::type>::Incr(p$2);@] \ - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet::Do(3), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \ + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(3), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \ } \ else \ - RETURN_META_VALUE(MRES_IGNORED, MakeRet::Do(3)); \ + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(3)); \ } \ }; \ struct Delegate4 : public MyDelegate \ @@ -333,10 +338,10 @@ if (ms_DoRecall) \ { \ @[$2,1,$1:Increment::type>::Incr(p$2);@] \ - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet::Do(4), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \ + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \ } \ else \ - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet::Do(4)); \ + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4)); \ }; \ }; \ }; \ @@ -361,6 +366,7 @@ @[$2,1,$1: paraminfos2_##id[$2].pNormalCtor = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk::type>::NormalConstructor) : NULL; @] \ @[$2,1,$1: paraminfos2_##id[$2].pCopyCtor = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk::type>::CopyConstructor) : NULL; @] \ @[$2,1,$1: paraminfos2_##id[$2].pDtor = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk::type>::Destructor) : NULL; @] \ + @[$2,1,$1: paraminfos2_##id[$2].pAssignOperator = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk::type>::AssignOp) : NULL; @] \ } @] @@ -375,6 +381,7 @@ protoinfo_##id.retPassInfo2.pNormalCtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk::type>::NormalConstructor) : NULL; \ protoinfo_##id.retPassInfo2.pCopyCtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk::type>::CopyConstructor) : NULL; \ protoinfo_##id.retPassInfo2.pDtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk::type>::Destructor) : NULL; \ + protoinfo_##id.retPassInfo2.pAssignOperator = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk::type>::AssignOp) : NULL; \ } #define THGM_ADD_HOOK(id, num) \