1.1 --- a/sourcehook/test/testhookmangen.hxx Thu Nov 01 17:29:39 2007 +0000
1.2 +++ b/sourcehook/test/testhookmangen.hxx Fri Nov 02 00:53:32 2007 +0000
1.3 @@ -29,6 +29,11 @@
1.4 {
1.5 reinterpret_cast<T*>(this)->~T();
1.6 }
1.7 +
1.8 + const T& AssignOp(const T &other)
1.9 + {
1.10 + return (*reinterpret_cast<T*>(this) = other);
1.11 + }
1.12 };
1.13
1.14
1.15 @@ -99,7 +104,7 @@
1.16 {
1.17 static POD<SIZE> Do(int a)
1.18 {
1.19 - POD x;
1.20 + POD<SIZE> x;
1.21 memset(reinterpret_cast<void*>(x.x), a, SIZE);
1.22 return x;
1.23 }
1.24 @@ -272,7 +277,7 @@
1.25 ADD_STATE(State_Func##id(this, ParamState_m##id(@[$2,1,$1|, :p$2@]))); \
1.26 g_Inside_LeafFunc = false; \
1.27 \
1.28 - return MakeRet<ret_type>::Do(0); \
1.29 + return MakeRet< ret_type >::Do(0); \
1.30 } \
1.31 \
1.32 struct Delegate1 : public MyDelegate \
1.33 @@ -285,10 +290,10 @@
1.34 if (ms_DoRecall) \
1.35 { \
1.36 @[$2,1,$1:Increment<StripRef< param$2 >::type>::Incr(p$2);@] \
1.37 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(1), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.38 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(1), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.39 } \
1.40 else \
1.41 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(1)); \
1.42 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(1)); \
1.43 } \
1.44 }; \
1.45 struct Delegate2 : public MyDelegate \
1.46 @@ -301,10 +306,10 @@
1.47 if (ms_DoRecall) \
1.48 { \
1.49 @[$2,1,$1:Increment<StripRef< param$2 >::type>::Incr(p$2);@] \
1.50 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.51 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.52 } \
1.53 else \
1.54 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2)); \
1.55 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2)); \
1.56 } \
1.57 }; \
1.58 struct Delegate3 : public MyDelegate \
1.59 @@ -317,10 +322,10 @@
1.60 if (ms_DoRecall) \
1.61 { \
1.62 @[$2,1,$1:Increment<StripRef< param$2 >::type>::Incr(p$2);@] \
1.63 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(3), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.64 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(3), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.65 } \
1.66 else \
1.67 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(3)); \
1.68 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(3)); \
1.69 } \
1.70 }; \
1.71 struct Delegate4 : public MyDelegate \
1.72 @@ -333,10 +338,10 @@
1.73 if (ms_DoRecall) \
1.74 { \
1.75 @[$2,1,$1:Increment<StripRef< param$2 >::type>::Incr(p$2);@] \
1.76 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.77 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.78 } \
1.79 else \
1.80 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4)); \
1.81 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4)); \
1.82 }; \
1.83 }; \
1.84 }; \
1.85 @@ -361,6 +366,7 @@
1.86 @[$2,1,$1: paraminfos2_##id[$2].pNormalCtor = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::NormalConstructor) : NULL; @] \
1.87 @[$2,1,$1: paraminfos2_##id[$2].pCopyCtor = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::CopyConstructor) : NULL; @] \
1.88 @[$2,1,$1: paraminfos2_##id[$2].pDtor = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::Destructor) : NULL; @] \
1.89 + @[$2,1,$1: paraminfos2_##id[$2].pAssignOperator = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::AssignOp) : NULL; @] \
1.90 }
1.91
1.92 @]
1.93 @@ -375,6 +381,7 @@
1.94 protoinfo_##id.retPassInfo2.pNormalCtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::NormalConstructor) : NULL; \
1.95 protoinfo_##id.retPassInfo2.pCopyCtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::CopyConstructor) : NULL; \
1.96 protoinfo_##id.retPassInfo2.pDtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::Destructor) : NULL; \
1.97 + protoinfo_##id.retPassInfo2.pAssignOperator = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::AssignOp) : NULL; \
1.98 }
1.99
1.100 #define THGM_ADD_HOOK(id, num) \