diff -r 90056ffa9784 -r 71016f952503 sourcehook/sh_memfuncinfo.h --- a/sourcehook/sh_memfuncinfo.h Wed May 04 13:59:57 2005 +0000 +++ b/sourcehook/sh_memfuncinfo.h Thu May 05 10:40:47 2005 +0000 @@ -281,12 +281,254 @@ # error Unsupported compiler # endif + // This version does not take a this pointer + // Useful for hookdecls, as they ensure that mfp is correct through a static_cast template inline void GetFuncInfo(X mfp, MemFuncInfo &out) { MFI_Impl::GetFuncInfo(mfp, out); } + // Versions which do take a this + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(), MemFuncInfo &out) + { + RetType(Y::*mfp2)() = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)() const, MemFuncInfo &out) + { + RetType(Y::*mfp2)() const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + } #endif +