1.1 --- a/sourcehook/generate/sh_memfuncinfo.h Sat May 13 16:59:57 2006 +0000
1.2 +++ b/sourcehook/generate/sh_memfuncinfo.h Sat May 13 17:57:35 2006 +0000
1.3 @@ -289,6 +289,7 @@
1.4 }
1.5
1.6 // Versions which do take a this
1.7 +
1.8 template<class X, class Y, class RetType>
1.9 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(), MemFuncInfo &out)
1.10 {
1.11 @@ -587,6 +588,7 @@
1.12 // GCC & MSVC 7.1 need this, MSVC 7.0 doesn't like it
1.13 #if SH_COMP != SH_COMP_MSVC || _MSC_VER > 1300
1.14
1.15 +
1.16 template<class X, class Y, class RetType>
1.17 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(...), MemFuncInfo &out)
1.18 {
1.19 @@ -601,6 +603,7 @@
1.20 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.21 }
1.22
1.23 +
1.24 template<class X, class Y, class RetType, class Param1>
1.25 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, ...), MemFuncInfo &out)
1.26 {
1.27 @@ -615,6 +618,7 @@
1.28 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.29 }
1.30
1.31 +
1.32 template<class X, class Y, class RetType, class Param1, class Param2>
1.33 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, ...), MemFuncInfo &out)
1.34 {
1.35 @@ -629,6 +633,7 @@
1.36 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.37 }
1.38
1.39 +
1.40 template<class X, class Y, class RetType, class Param1, class Param2, class Param3>
1.41 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, ...), MemFuncInfo &out)
1.42 {
1.43 @@ -643,6 +648,7 @@
1.44 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.45 }
1.46
1.47 +
1.48 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4>
1.49 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, ...), MemFuncInfo &out)
1.50 {
1.51 @@ -657,6 +663,7 @@
1.52 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.53 }
1.54
1.55 +
1.56 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5>
1.57 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, ...), MemFuncInfo &out)
1.58 {
1.59 @@ -671,6 +678,7 @@
1.60 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.61 }
1.62
1.63 +
1.64 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6>
1.65 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, ...), MemFuncInfo &out)
1.66 {
1.67 @@ -685,6 +693,7 @@
1.68 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.69 }
1.70
1.71 +
1.72 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7>
1.73 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...), MemFuncInfo &out)
1.74 {
1.75 @@ -699,6 +708,7 @@
1.76 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.77 }
1.78
1.79 +
1.80 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8>
1.81 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...), MemFuncInfo &out)
1.82 {
1.83 @@ -713,6 +723,7 @@
1.84 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.85 }
1.86
1.87 +
1.88 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9>
1.89 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...), MemFuncInfo &out)
1.90 {
1.91 @@ -727,6 +738,7 @@
1.92 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.93 }
1.94
1.95 +
1.96 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10>
1.97 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...), MemFuncInfo &out)
1.98 {
1.99 @@ -741,6 +753,7 @@
1.100 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.101 }
1.102
1.103 +
1.104 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11>
1.105 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...), MemFuncInfo &out)
1.106 {
1.107 @@ -755,6 +768,7 @@
1.108 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.109 }
1.110
1.111 +
1.112 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12>
1.113 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...), MemFuncInfo &out)
1.114 {
1.115 @@ -769,6 +783,7 @@
1.116 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.117 }
1.118
1.119 +
1.120 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13>
1.121 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...), MemFuncInfo &out)
1.122 {
1.123 @@ -783,6 +798,7 @@
1.124 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.125 }
1.126
1.127 +
1.128 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14>
1.129 inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...), MemFuncInfo &out)
1.130 {
1.131 @@ -797,6 +813,7 @@
1.132 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.133 }
1.134
1.135 +
1.136 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15>
1.137 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)
1.138 {
1.139 @@ -811,6 +828,7 @@
1.140 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.141 }
1.142
1.143 +
1.144 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16>
1.145 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)
1.146 {
1.147 @@ -825,6 +843,7 @@
1.148 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.149 }
1.150
1.151 +
1.152 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17>
1.153 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)
1.154 {
1.155 @@ -839,6 +858,7 @@
1.156 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.157 }
1.158
1.159 +
1.160 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17, class Param18>
1.161 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)
1.162 {
1.163 @@ -853,6 +873,7 @@
1.164 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.165 }
1.166
1.167 +
1.168 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17, class Param18, class Param19>
1.169 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)
1.170 {
1.171 @@ -867,6 +888,7 @@
1.172 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.173 }
1.174
1.175 +
1.176 template<class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class Param12, class Param13, class Param14, class Param15, class Param16, class Param17, class Param18, class Param19, class Param20>
1.177 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)
1.178 {
1.179 @@ -882,10 +904,10 @@
1.180 }
1.181
1.182
1.183 +
1.184 #endif
1.185
1.186 }
1.187
1.188 #endif
1.189
1.190 -