1.1 --- a/sourcehook/test/testhookmangen.hxx Thu Nov 01 01:58:44 2007 +0000
1.2 +++ b/sourcehook/test/testhookmangen.hxx Thu Nov 01 17:29:39 2007 +0000
1.3 @@ -84,6 +84,27 @@
1.4 };
1.5 };
1.6
1.7 +// Return value maker
1.8 +template <class T>
1.9 +struct MakeRet
1.10 +{
1.11 + static T Do(int a)
1.12 + {
1.13 + return a;
1.14 + }
1.15 +};
1.16 +
1.17 +template <int SIZE>
1.18 +struct MakeRet< POD<SIZE> >
1.19 +{
1.20 + static POD<SIZE> Do(int a)
1.21 + {
1.22 + POD x;
1.23 + memset(reinterpret_cast<void*>(x.x), a, SIZE);
1.24 + return x;
1.25 + }
1.26 +};
1.27 +
1.28 // Stores parameter status
1.29 @[$1,0,$a:
1.30
1.31 @@ -251,7 +272,7 @@
1.32 ADD_STATE(State_Func##id(this, ParamState_m##id(@[$2,1,$1|, :p$2@]))); \
1.33 g_Inside_LeafFunc = false; \
1.34 \
1.35 - return 0; \
1.36 + return MakeRet<ret_type>::Do(0); \
1.37 } \
1.38 \
1.39 struct Delegate1 : public MyDelegate \
1.40 @@ -264,10 +285,10 @@
1.41 if (ms_DoRecall) \
1.42 { \
1.43 @[$2,1,$1:Increment<StripRef< param$2 >::type>::Incr(p$2);@] \
1.44 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, 1, &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.45 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(1), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.46 } \
1.47 else \
1.48 - RETURN_META_VALUE(MRES_IGNORED, 1); \
1.49 + RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(1)); \
1.50 } \
1.51 }; \
1.52 struct Delegate2 : public MyDelegate \
1.53 @@ -280,10 +301,10 @@
1.54 if (ms_DoRecall) \
1.55 { \
1.56 @[$2,1,$1:Increment<StripRef< param$2 >::type>::Incr(p$2);@] \
1.57 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, 2, &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.58 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.59 } \
1.60 else \
1.61 - RETURN_META_VALUE(MRES_SUPERCEDE, 2); \
1.62 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2)); \
1.63 } \
1.64 }; \
1.65 struct Delegate3 : public MyDelegate \
1.66 @@ -296,10 +317,10 @@
1.67 if (ms_DoRecall) \
1.68 { \
1.69 @[$2,1,$1:Increment<StripRef< param$2 >::type>::Incr(p$2);@] \
1.70 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, 3, &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.71 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(3), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.72 } \
1.73 else \
1.74 - RETURN_META_VALUE(MRES_IGNORED, 3); \
1.75 + RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(3)); \
1.76 } \
1.77 }; \
1.78 struct Delegate4 : public MyDelegate \
1.79 @@ -312,10 +333,10 @@
1.80 if (ms_DoRecall) \
1.81 { \
1.82 @[$2,1,$1:Increment<StripRef< param$2 >::type>::Incr(p$2);@] \
1.83 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, 4, &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.84 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
1.85 } \
1.86 else \
1.87 - RETURN_META_VALUE(MRES_SUPERCEDE, 4); \
1.88 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4)); \
1.89 }; \
1.90 }; \
1.91 }; \