diff -r 5f80856d32d8 -r 25d98645f668 sourcehook/sh_memfuncinfo.h --- a/sourcehook/sh_memfuncinfo.h Sat May 13 16:59:57 2006 +0000 +++ b/sourcehook/sh_memfuncinfo.h Sat May 13 17:57:35 2006 +0000 @@ -289,6 +289,7 @@ } // Versions which do take a this + template inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(), MemFuncInfo &out) { @@ -587,6 +588,7 @@ // GCC & MSVC 7.1 need this, MSVC 7.0 doesn't like it #if SH_COMP != SH_COMP_MSVC || _MSC_VER > 1300 + template inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(...), MemFuncInfo &out) { @@ -601,6 +603,7 @@ MFI_Impl::GetFuncInfo(mfp2, out); } + template inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, ...), MemFuncInfo &out) { @@ -615,6 +618,7 @@ MFI_Impl::GetFuncInfo(mfp2, out); } + template inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, ...), MemFuncInfo &out) { @@ -629,6 +633,7 @@ MFI_Impl::GetFuncInfo(mfp2, out); } + template inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, ...), MemFuncInfo &out) { @@ -643,6 +648,7 @@ MFI_Impl::GetFuncInfo(mfp2, out); } + template inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, ...), MemFuncInfo &out) { @@ -657,6 +663,7 @@ MFI_Impl::GetFuncInfo(mfp2, out); } + template inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, ...), MemFuncInfo &out) { @@ -671,6 +678,7 @@ MFI_Impl::GetFuncInfo(mfp2, out); } + template inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, ...), MemFuncInfo &out) { @@ -685,6 +693,7 @@ MFI_Impl::GetFuncInfo(mfp2, out); } + template inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...), MemFuncInfo &out) { @@ -699,6 +708,7 @@ MFI_Impl::GetFuncInfo(mfp2, out); } + template inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...), MemFuncInfo &out) { @@ -713,6 +723,7 @@ 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) { @@ -727,6 +738,7 @@ 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) { @@ -741,6 +753,7 @@ 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) { @@ -755,6 +768,7 @@ 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) { @@ -769,6 +783,7 @@ 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) { @@ -783,6 +798,7 @@ 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) { @@ -797,6 +813,7 @@ 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) { @@ -811,6 +828,7 @@ 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) { @@ -825,6 +843,7 @@ 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, Param17, ...), MemFuncInfo &out) { @@ -839,6 +858,7 @@ 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, Param17, Param18, ...), MemFuncInfo &out) { @@ -853,6 +873,7 @@ 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, Param17, Param18, Param19, ...), MemFuncInfo &out) { @@ -867,6 +888,7 @@ 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, Param17, Param18, Param19, Param20, ...), MemFuncInfo &out) { @@ -882,10 +904,10 @@ } + #endif } #endif -