1.1 --- a/sourcehook/FastDelegate.h Sat Apr 30 18:45:41 2005 +0000
1.2 +++ b/sourcehook/FastDelegate.h Sat Apr 30 19:09:51 2005 +0000
1.3 @@ -2627,6 +2627,11 @@
1.4 return FastDelegate0<FASTDLGT_RETTYPE>(x, func);
1.5 }
1.6
1.7 +template <class RetType>
1.8 +FastDelegate0<FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)()) {
1.9 + return FastDelegate0<FASTDLGT_RETTYPE>(func);
1.10 +}
1.11 +
1.12 //N=1
1.13 template <class X, class Y, class Param1, class RetType>
1.14 FastDelegate1<Param1, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1)) {
1.15 @@ -2638,6 +2643,11 @@
1.16 return FastDelegate1<Param1, FASTDLGT_RETTYPE>(x, func);
1.17 }
1.18
1.19 +template <class Param1, class RetType>
1.20 +FastDelegate1<Param1, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1)) {
1.21 + return FastDelegate1<Param1, FASTDLGT_RETTYPE>(func);
1.22 +}
1.23 +
1.24 //N=2
1.25 template <class X, class Y, class Param1, class Param2, class RetType>
1.26 FastDelegate2<Param1, Param2, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2)) {
1.27 @@ -2649,6 +2659,11 @@
1.28 return FastDelegate2<Param1, Param2, FASTDLGT_RETTYPE>(x, func);
1.29 }
1.30
1.31 +template <class Param1, class Param2, class RetType>
1.32 +FastDelegate2<Param1, Param2, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2)) {
1.33 + return FastDelegate2<Param1, Param2, FASTDLGT_RETTYPE>(func);
1.34 +}
1.35 +
1.36 //N=3
1.37 template <class X, class Y, class Param1, class Param2, class Param3, class RetType>
1.38 FastDelegate3<Param1, Param2, Param3, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3)) {
1.39 @@ -2660,6 +2675,11 @@
1.40 return FastDelegate3<Param1, Param2, Param3, FASTDLGT_RETTYPE>(x, func);
1.41 }
1.42
1.43 +template <class Param1, class Param2, class Param3, class RetType>
1.44 +FastDelegate3<Param1, Param2, Param3, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3)) {
1.45 + return FastDelegate3<Param1, Param2, Param3, FASTDLGT_RETTYPE>(func);
1.46 +}
1.47 +
1.48 //N=4
1.49 template <class X, class Y, class Param1, class Param2, class Param3, class Param4, class RetType>
1.50 FastDelegate4<Param1, Param2, Param3, Param4, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4)) {
1.51 @@ -2671,6 +2691,11 @@
1.52 return FastDelegate4<Param1, Param2, Param3, Param4, FASTDLGT_RETTYPE>(x, func);
1.53 }
1.54
1.55 +template <class Param1, class Param2, class Param3, class Param4, class RetType>
1.56 +FastDelegate4<Param1, Param2, Param3, Param4, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4)) {
1.57 + return FastDelegate4<Param1, Param2, Param3, Param4, FASTDLGT_RETTYPE>(func);
1.58 +}
1.59 +
1.60 //N=5
1.61 template <class X, class Y, class Param1, class Param2, class Param3, class Param4, class Param5, class RetType>
1.62 FastDelegate5<Param1, Param2, Param3, Param4, Param5, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5)) {
1.63 @@ -2682,6 +2707,11 @@
1.64 return FastDelegate5<Param1, Param2, Param3, Param4, Param5, FASTDLGT_RETTYPE>(x, func);
1.65 }
1.66
1.67 +template <class Param1, class Param2, class Param3, class Param4, class Param5, class RetType>
1.68 +FastDelegate5<Param1, Param2, Param3, Param4, Param5, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5)) {
1.69 + return FastDelegate5<Param1, Param2, Param3, Param4, Param5, FASTDLGT_RETTYPE>(func);
1.70 +}
1.71 +
1.72 //N=6
1.73 template <class X, class Y, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class RetType>
1.74 FastDelegate6<Param1, Param2, Param3, Param4, Param5, Param6, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6)) {
1.75 @@ -2693,6 +2723,11 @@
1.76 return FastDelegate6<Param1, Param2, Param3, Param4, Param5, Param6, FASTDLGT_RETTYPE>(x, func);
1.77 }
1.78
1.79 +template <class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class RetType>
1.80 +FastDelegate6<Param1, Param2, Param3, Param4, Param5, Param6, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6)) {
1.81 + return FastDelegate6<Param1, Param2, Param3, Param4, Param5, Param6, FASTDLGT_RETTYPE>(func);
1.82 +}
1.83 +
1.84 //N=7
1.85 template <class X, class Y, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class RetType>
1.86 FastDelegate7<Param1, Param2, Param3, Param4, Param5, Param6, Param7, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7)) {
1.87 @@ -2704,6 +2739,11 @@
1.88 return FastDelegate7<Param1, Param2, Param3, Param4, Param5, Param6, Param7, FASTDLGT_RETTYPE>(x, func);
1.89 }
1.90
1.91 +template <class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class RetType>
1.92 +FastDelegate7<Param1, Param2, Param3, Param4, Param5, Param6, Param7, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7)) {
1.93 + return FastDelegate7<Param1, Param2, Param3, Param4, Param5, Param6, Param7, FASTDLGT_RETTYPE>(func);
1.94 +}
1.95 +
1.96 //N=8
1.97 template <class X, class Y, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class RetType>
1.98 FastDelegate8<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8)) {
1.99 @@ -2715,6 +2755,11 @@
1.100 return FastDelegate8<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, FASTDLGT_RETTYPE>(x, func);
1.101 }
1.102
1.103 +template <class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class RetType>
1.104 +FastDelegate8<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8)) {
1.105 + return FastDelegate8<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, FASTDLGT_RETTYPE>(func);
1.106 +}
1.107 +
1.108 //N=9
1.109 template <class X, class Y, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class RetType>
1.110 FastDelegate9<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9)) {
1.111 @@ -2726,6 +2771,11 @@
1.112 return FastDelegate9<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, FASTDLGT_RETTYPE>(x, func);
1.113 }
1.114
1.115 +template <class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class RetType>
1.116 +FastDelegate9<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9)) {
1.117 + return FastDelegate9<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, FASTDLGT_RETTYPE>(func);
1.118 +}
1.119 +
1.120 //N=10
1.121 template <class X, class Y, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class RetType>
1.122 FastDelegate10<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10)) {
1.123 @@ -2737,6 +2787,11 @@
1.124 return FastDelegate10<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, FASTDLGT_RETTYPE>(x, func);
1.125 }
1.126
1.127 +template <class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class RetType>
1.128 +FastDelegate10<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10)) {
1.129 + return FastDelegate10<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, FASTDLGT_RETTYPE>(func);
1.130 +}
1.131 +
1.132 //N=11
1.133 template <class X, class Y, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class RetType>
1.134 FastDelegate11<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11)) {
1.135 @@ -2748,6 +2803,11 @@
1.136 return FastDelegate11<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, FASTDLGT_RETTYPE>(x, func);
1.137 }
1.138
1.139 +template <class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8, class Param9, class Param10, class Param11, class RetType>
1.140 +FastDelegate11<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11)) {
1.141 + return FastDelegate11<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, FASTDLGT_RETTYPE>(func);
1.142 +}
1.143 +
1.144 //N=12
1.145 template <class X, class Y, 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 RetType>
1.146 FastDelegate12<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12)) {
1.147 @@ -2759,6 +2819,11 @@
1.148 return FastDelegate12<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, FASTDLGT_RETTYPE>(x, func);
1.149 }
1.150
1.151 +template <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 RetType>
1.152 +FastDelegate12<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12)) {
1.153 + return FastDelegate12<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, FASTDLGT_RETTYPE>(func);
1.154 +}
1.155 +
1.156 //N=13
1.157 template <class X, class Y, 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 RetType>
1.158 FastDelegate13<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13)) {
1.159 @@ -2770,6 +2835,11 @@
1.160 return FastDelegate13<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, FASTDLGT_RETTYPE>(x, func);
1.161 }
1.162
1.163 +template <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 RetType>
1.164 +FastDelegate13<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13)) {
1.165 + return FastDelegate13<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, FASTDLGT_RETTYPE>(func);
1.166 +}
1.167 +
1.168 //N=14
1.169 template <class X, class Y, 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 RetType>
1.170 FastDelegate14<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14)) {
1.171 @@ -2781,6 +2851,11 @@
1.172 return FastDelegate14<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, FASTDLGT_RETTYPE>(x, func);
1.173 }
1.174
1.175 +template <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 RetType>
1.176 +FastDelegate14<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14)) {
1.177 + return FastDelegate14<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, FASTDLGT_RETTYPE>(func);
1.178 +}
1.179 +
1.180 //N=15
1.181 template <class X, class Y, 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 RetType>
1.182 FastDelegate15<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15)) {
1.183 @@ -2792,6 +2867,11 @@
1.184 return FastDelegate15<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, FASTDLGT_RETTYPE>(x, func);
1.185 }
1.186
1.187 +template <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 RetType>
1.188 +FastDelegate15<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15)) {
1.189 + return FastDelegate15<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, FASTDLGT_RETTYPE>(func);
1.190 +}
1.191 +
1.192 //N=16
1.193 template <class X, class Y, 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 RetType>
1.194 FastDelegate16<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, FASTDLGT_RETTYPE> MakeDelegate(Y* x, RetType (X::*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16)) {
1.195 @@ -2803,6 +2883,11 @@
1.196 return FastDelegate16<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, FASTDLGT_RETTYPE>(x, func);
1.197 }
1.198
1.199 +template <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 RetType>
1.200 +FastDelegate16<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(Param1 p1, Param2 p2, Param3 p3, Param4 p4, Param5 p5, Param6 p6, Param7 p7, Param8 p8, Param9 p9, Param10 p10, Param11 p11, Param12 p12, Param13 p13, Param14 p14, Param15 p15, Param16 p16)) {
1.201 + return FastDelegate16<Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, FASTDLGT_RETTYPE>(func);
1.202 +}
1.203 +
1.204
1.205 // clean up after ourselves...
1.206 #undef FASTDLGT_RETTYPE
2.1 --- a/sourcehook/generate/FastDelegate.hxx Sat Apr 30 18:45:41 2005 +0000
2.2 +++ b/sourcehook/generate/FastDelegate.hxx Sat Apr 30 19:09:51 2005 +0000
2.3 @@ -981,6 +981,11 @@
2.4 return FastDelegate@NUM<@SELARGS, FASTDLGT_RETTYPE>(x, func);
2.5 }
2.6
2.7 +template <@CLASSARGS, class RetType>
2.8 +FastDelegate@NUM<@SELARGS, FASTDLGT_RETTYPE> MakeDelegate(RetType (*func)(@FUNCARGS)) {
2.9 + return FastDelegate@NUM<@SELARGS, FASTDLGT_RETTYPE>(func);
2.10 +}
2.11 +
2.12 @ENDVAR
2.13
2.14 // clean up after ourselves...
3.1 --- a/sourcehook/generate/sourcehook.hxx Sat Apr 30 18:45:41 2005 +0000
3.2 +++ b/sourcehook/generate/sourcehook.hxx Sat Apr 30 19:09:51 2005 +0000
3.3 @@ -300,16 +300,16 @@
3.4 #define SH_RELEASE_CALLCLASS(ptr) SH_GLOB_SHPTR->ReleaseCallClass(reinterpret_cast<SourceHook::GenericCallClass*>(ptr))
3.5
3.6 #define SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \
3.7 - SourceHook::SH_FHAdd##ifacetype##ifacefunc((void*)ifaceptr, post, handler)
3.8 + __SourceHook_FHAdd##ifacetype##ifacefunc((void*)ifaceptr, post, handler)
3.9 #define SH_ADD_HOOK_STATICFUNC(ifacetype, ifacefunc, ifaceptr, handler, post) \
3.10 - SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post)
3.11 + SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, fastdelegate::MakeDelegate(handler), post)
3.12 #define SH_ADD_HOOK_MEMFUNC(ifacetype, ifacefunc, ifaceptr, handler_inst, handler_func, post) \
3.13 SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, fastdelegate::MakeDelegate(handler_inst, handler_func), post)
3.14
3.15 #define SH_REMOVE_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \
3.16 - SourceHook::SH_FHRemove##ifacetype##ifacefunc((void*)ifaceptr, post, handler)
3.17 + __SourceHook_FHRemove##ifacetype##ifacefunc((void*)ifaceptr, post, handler)
3.18 #define SH_REMOVE_HOOK_STATICFUNC(ifacetype, ifacefunc, ifaceptr, handler, post) \
3.19 - SH_REMOVE_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post)
3.20 + SH_REMOVE_HOOK(ifacetype, ifacefunc, ifaceptr, fastdelegate::MakeDelegate(handler), post)
3.21 #define SH_REMOVE_HOOK_MEMFUNC(ifacetype, ifacefunc, ifaceptr, handler_inst, handler_func, post) \
3.22 SH_REMOVE_HOOK(ifacetype, ifacefunc, ifaceptr, fastdelegate::MakeDelegate(handler_inst, handler_func), post)
3.23
3.24 @@ -329,12 +329,13 @@
3.25 #endif
3.26
3.27 //////////////////////////////////////////////////////////////////////////
3.28 -#define SH_FHCls(ift, iff, ov) FHCls_##ift##iff##ov
3.29 +#define SH_FHCls(ift, iff, ov) __SourceHook_FHCls_##ift##iff##ov
3.30
3.31 #define SHINT_MAKE_HOOKMANPUBFUNC(ifacetype, ifacefunc, overload, funcptr) \
3.32 - static int HookManPubFunc(HookManagerAction action, HookManagerInfo *param) \
3.33 + static int HookManPubFunc(::SourceHook::HookManagerAction action, ::SourceHook::HookManagerInfo *param) \
3.34 { \
3.35 - if (action == HA_GetInfo) \
3.36 + using namespace ::SourceHook; \
3.37 + if (action == ::SourceHook::HA_GetInfo) \
3.38 { \
3.39 param->proto = ms_Proto; \
3.40 MemFuncInfo mfi; \
3.41 @@ -347,12 +348,12 @@
3.42 reinterpret_cast<void**>(reinterpret_cast<char*>(&ms_Inst) + mfi.vtbloffs)[mfi.vtblindex]; \
3.43 return 0; \
3.44 } \
3.45 - else if (action == HA_Register) \
3.46 + else if (action == ::SourceHook::HA_Register) \
3.47 { \
3.48 ms_HI = param; \
3.49 return 0; \
3.50 } \
3.51 - else if (action == HA_Unregister) \
3.52 + else if (action == ::SourceHook::HA_Unregister) \
3.53 { \
3.54 ms_HI = NULL; \
3.55 return 0; \
3.56 @@ -361,49 +362,52 @@
3.57 return 1; \
3.58 }
3.59
3.60 +// It has to be possible to use the macros in namespaces
3.61 +// -> So we need to access and extend the global SourceHook namespace
3.62 +// We use a namespace alias for this
3.63 #define SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, funcptr) \
3.64 - namespace SourceHook \
3.65 + struct SH_FHCls(ifacetype,ifacefunc,overload) \
3.66 { \
3.67 - struct SH_FHCls(ifacetype,ifacefunc,overload) \
3.68 - { \
3.69 - static SH_FHCls(ifacetype,ifacefunc,overload) ms_Inst; \
3.70 - static HookManagerInfo *ms_HI; \
3.71 - static const char *ms_Proto; \
3.72 - SHINT_MAKE_HOOKMANPUBFUNC(ifacetype, ifacefunc, overload, funcptr)
3.73 + static SH_FHCls(ifacetype,ifacefunc,overload) ms_Inst; \
3.74 + static ::SourceHook::HookManagerInfo *ms_HI; \
3.75 + static const char *ms_Proto; \
3.76 + SHINT_MAKE_HOOKMANPUBFUNC(ifacetype, ifacefunc, overload, funcptr)
3.77
3.78 #define SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, proto, funcptr) \
3.79 - }; \
3.80 - const char *SH_FHCls(ifacetype,ifacefunc,overload)::ms_Proto = proto; \
3.81 - SH_FHCls(ifacetype,ifacefunc,overload) SH_FHCls(ifacetype,ifacefunc,overload)::ms_Inst; \
3.82 - HookManagerInfo *SH_FHCls(ifacetype,ifacefunc,overload)::ms_HI; \
3.83 - bool SH_FHAdd##ifacetype##ifacefunc(void *iface, bool post, \
3.84 - SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
3.85 - { \
3.86 - MemFuncInfo mfi; \
3.87 - GetFuncInfo(funcptr, mfi); \
3.88 - if (mfi.thisptroffs < 0) \
3.89 - return false; /* No virtual inheritance supported */ \
3.90 - \
3.91 - return SH_GLOB_SHPTR->AddHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
3.92 - SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, \
3.93 - new CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD>(handler), post); \
3.94 - } \
3.95 - bool SH_FHRemove##ifacetype##ifacefunc(void *iface, bool post, \
3.96 - SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
3.97 - { \
3.98 - MemFuncInfo mfi; \
3.99 - GetFuncInfo(funcptr, mfi); \
3.100 - if (mfi.thisptroffs < 0) \
3.101 - return false; /* No virtual inheritance supported */ \
3.102 - \
3.103 - CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD> tmp(handler); \
3.104 - return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
3.105 - SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, &tmp, post); \
3.106 - } \
3.107 - }
3.108 + }; \
3.109 + const char *SH_FHCls(ifacetype,ifacefunc,overload)::ms_Proto = proto; \
3.110 + SH_FHCls(ifacetype,ifacefunc,overload) SH_FHCls(ifacetype,ifacefunc,overload)::ms_Inst; \
3.111 + ::SourceHook::HookManagerInfo *SH_FHCls(ifacetype,ifacefunc,overload)::ms_HI; \
3.112 + bool __SourceHook_FHAdd##ifacetype##ifacefunc(void *iface, bool post, \
3.113 + SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
3.114 + { \
3.115 + using namespace ::SourceHook; \
3.116 + MemFuncInfo mfi; \
3.117 + GetFuncInfo(funcptr, mfi); \
3.118 + if (mfi.thisptroffs < 0) \
3.119 + return false; /* No virtual inheritance supported */ \
3.120 + \
3.121 + return SH_GLOB_SHPTR->AddHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
3.122 + SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, \
3.123 + new CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD>(handler), post); \
3.124 + } \
3.125 + bool __SourceHook_FHRemove##ifacetype##ifacefunc(void *iface, bool post, \
3.126 + SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
3.127 + { \
3.128 + using namespace ::SourceHook; \
3.129 + MemFuncInfo mfi; \
3.130 + GetFuncInfo(funcptr, mfi); \
3.131 + if (mfi.thisptroffs < 0) \
3.132 + return false; /* No virtual inheritance supported */ \
3.133 + \
3.134 + CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD> tmp(handler); \
3.135 + return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
3.136 + SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, &tmp, post); \
3.137 + } \
3.138
3.139 #define SH_SETUPCALLS(rettype, paramtypes, params) \
3.140 /* 1) Find the vfnptr */ \
3.141 + using namespace ::SourceHook; \
3.142 void *ourvfnptr = reinterpret_cast<void*>( \
3.143 *reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_HI->vtbl_offs) + ms_HI->vtbl_idx); \
3.144 \
3.145 @@ -428,7 +432,9 @@
3.146 /* 2) Declare some vars and set it up */ \
3.147 std::list<HookManagerInfo::VfnPtr::Iface::Hook> &prelist = ci.hooks_pre; \
3.148 std::list<HookManagerInfo::VfnPtr::Iface::Hook> &postlist = ci.hooks_post; \
3.149 - rettype orig_ret, override_ret, plugin_ret; \
3.150 + rettype orig_ret; \
3.151 + rettype override_ret; \
3.152 + rettype plugin_ret; \
3.153 META_RES &cur_res = SH_GLOB_SHPTR->GetCurResRef(); \
3.154 META_RES &prev_res = SH_GLOB_SHPTR->GetPrevResRef(); \
3.155 META_RES &status = SH_GLOB_SHPTR->GetStatusRef(); \
3.156 @@ -476,6 +482,7 @@
3.157
3.158 //////////////////////////////////////////////////////////////////////////
3.159 #define SH_SETUPCALLS_void(paramtypes, params) \
3.160 + using namespace ::SourceHook; \
3.161 /* 1) Find the vfnptr */ \
3.162 void *ourvfnptr = reinterpret_cast<void*>( \
3.163 *reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_HI->vtbl_offs) + ms_HI->vtbl_idx); \
3.164 @@ -559,28 +566,28 @@
3.165 @VARARGS@
3.166 // ********* Support for @$@ arguments *********
3.167 #define SH_DECL_HOOK@$@(ifacetype, ifacefunc, attr, overload, rettype@, param%%@) \
3.168 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(@param%%|, @)> \
3.169 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(@param%%|, @) attr> \
3.170 (&ifacetype::ifacefunc))) \
3.171 typedef fastdelegate::FastDelegate@$@<@param%%|, @@, @rettype> FD; \
3.172 - virtual rettype Func(@param%% p%%|, @) attr \
3.173 + virtual rettype Func(@param%% p%%|, @) \
3.174 { SH_HANDLEFUNC(ifacetype, ifacefunc, (@param%%|, @), (@p%%|, @), rettype); } \
3.175 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype @"|" #param%%| @, \
3.176 - (static_cast<rettype (ifacetype::*)(@param%%|, @)>(&ifacetype::ifacefunc)))
3.177 + (static_cast<rettype (ifacetype::*)(@param%%|, @) attr>(&ifacetype::ifacefunc)))
3.178
3.179 #define SH_DECL_HOOK@$@_void(ifacetype, ifacefunc, attr, overload@, param%%@) \
3.180 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(@param%%|, @)> \
3.181 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(@param%%|, @) attr> \
3.182 (&ifacetype::ifacefunc))) \
3.183 typedef fastdelegate::FastDelegate@$@<@param%%|, @> FD; \
3.184 - virtual void Func(@param%% p%%|, @) attr \
3.185 + virtual void Func(@param%% p%%|, @) \
3.186 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (@param%%|, @), (@p%%|, @)); } \
3.187 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr @"|" #param%%| @, \
3.188 - (static_cast<void (ifacetype::*)(@param%%|, @)>(&ifacetype::ifacefunc)))
3.189 + (static_cast<void (ifacetype::*)(@param%%|, @) attr>(&ifacetype::ifacefunc)))
3.190
3.191 #define SH_DECL_HOOK@$@_vafmt(ifacetype, ifacefunc, attr, overload, rettype@, param%%@) \
3.192 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(@param%%|, @@, @const char *, ...)> \
3.193 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(@param%%|, @@, @const char *, ...) attr> \
3.194 (&ifacetype::ifacefunc))) \
3.195 typedef fastdelegate::FastDelegate@$+1@<@param%%|, @@, @const char *, rettype> FD; \
3.196 - virtual rettype Func(@param%% p%%|, @@, @const char *fmt, ...) attr \
3.197 + virtual rettype Func(@param%% p%%|, @@, @const char *fmt, ...) \
3.198 { \
3.199 char buf[STRBUF_LEN]; \
3.200 va_list ap; \
3.201 @@ -590,13 +597,13 @@
3.202 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (@param%%|, @@, @...), (@p%%|, @@, @"%s", buf), (@p%%|, @@, @buf), rettype); \
3.203 } \
3.204 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype @"|" #param%%| @ "|const char*|...", \
3.205 - (static_cast<rettype (ifacetype::*)(@param%%|, @@, @const char *, ...)>(&ifacetype::ifacefunc)))
3.206 + (static_cast<rettype (ifacetype::*)(@param%%|, @@, @const char *, ...) attr>(&ifacetype::ifacefunc)))
3.207
3.208 #define SH_DECL_HOOK@$@_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype@, param%%@) \
3.209 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(@param%%|, @@, @const char *, ...)> \
3.210 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(@param%%|, @@, @const char *, ...) attr> \
3.211 (&ifacetype::ifacefunc))) \
3.212 typedef fastdelegate::FastDelegate@$+1@<@param%%|, @@, @const char *> FD; \
3.213 - virtual void Func(@param%% p%%|, @@, @const char *, ...) attr \
3.214 + virtual void Func(@param%% p%%|, @@, @const char *, ...) \
3.215 { \
3.216 char buf[STRBUF_LEN]; \
3.217 va_list ap; \
3.218 @@ -606,7 +613,7 @@
3.219 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (@param%%|, @@, @...), (@p%%|, @@, @"%s", buf), (@p%%|, @@, @buf)); \
3.220 } \
3.221 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr @"|" #param%%| @ "|const char*|...", \
3.222 - (static_cast<void (ifacetype::*)(@param%%|, @@, @const char *, ...)>(&ifacetype::ifacefunc)))
3.223 + (static_cast<void (ifacetype::*)(@param%%|, @@, @const char *, ...) attr>(&ifacetype::ifacefunc)))
3.224
3.225 @ENDARGS@
3.226
3.227 @@ -617,6 +624,7 @@
3.228
3.229 #define SH_MAKE_EXECUTABLECLASS_OB(call, prms) \
3.230 { \
3.231 + using namespace ::SourceHook; \
3.232 MemFuncInfo mfi; \
3.233 MFI_Impl<sizeof(m_MFP)>::GetFuncInfo(m_MFP, mfi); \
3.234 OrigVTables::const_iterator iter = m_CC->vt.find(mfi.vtbloffs); \
3.235 @@ -648,7 +656,7 @@
3.236
3.237 @VARARGS@
3.238 // Support for @$@ arguments
3.239 - template<@class Param%%|, @> RetType operator()(@Param%% p%%|, @) const
3.240 + @template<@@class Param%%|, @@> @RetType operator()(@Param%% p%%|, @) const
3.241 SH_MAKE_EXECUTABLECLASS_OB((@p%%@), (@Param%%@))
3.242
3.243 @ENDARGS@
3.244 @@ -664,6 +672,13 @@
3.245 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(@Param%%|, @)>(ptr, mfp);
3.246 }
3.247
3.248 +template <class X, class Y, class RetType@, @@class Param%%|, @>
3.249 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(@Param%%|, @) const>
3.250 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(@Param%%|, @)const)
3.251 +{
3.252 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(@Param%%|, @) const>(ptr, mfp);
3.253 +}
3.254 +
3.255 @ENDARGS@
3.256
3.257 #undef SH_MAKE_EXECUTABLECLASS_BODY
4.1 --- a/sourcehook/sourcehook.h Sat Apr 30 18:45:41 2005 +0000
4.2 +++ b/sourcehook/sourcehook.h Sat Apr 30 19:09:51 2005 +0000
4.3 @@ -300,16 +300,16 @@
4.4 #define SH_RELEASE_CALLCLASS(ptr) SH_GLOB_SHPTR->ReleaseCallClass(reinterpret_cast<SourceHook::GenericCallClass*>(ptr))
4.5
4.6 #define SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \
4.7 - SourceHook::SH_FHAdd##ifacetype##ifacefunc((void*)ifaceptr, post, handler)
4.8 + __SourceHook_FHAdd##ifacetype##ifacefunc((void*)ifaceptr, post, handler)
4.9 #define SH_ADD_HOOK_STATICFUNC(ifacetype, ifacefunc, ifaceptr, handler, post) \
4.10 - SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post)
4.11 + SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, fastdelegate::MakeDelegate(handler), post)
4.12 #define SH_ADD_HOOK_MEMFUNC(ifacetype, ifacefunc, ifaceptr, handler_inst, handler_func, post) \
4.13 SH_ADD_HOOK(ifacetype, ifacefunc, ifaceptr, fastdelegate::MakeDelegate(handler_inst, handler_func), post)
4.14
4.15 #define SH_REMOVE_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post) \
4.16 - SourceHook::SH_FHRemove##ifacetype##ifacefunc((void*)ifaceptr, post, handler)
4.17 + __SourceHook_FHRemove##ifacetype##ifacefunc((void*)ifaceptr, post, handler)
4.18 #define SH_REMOVE_HOOK_STATICFUNC(ifacetype, ifacefunc, ifaceptr, handler, post) \
4.19 - SH_REMOVE_HOOK(ifacetype, ifacefunc, ifaceptr, handler, post)
4.20 + SH_REMOVE_HOOK(ifacetype, ifacefunc, ifaceptr, fastdelegate::MakeDelegate(handler), post)
4.21 #define SH_REMOVE_HOOK_MEMFUNC(ifacetype, ifacefunc, ifaceptr, handler_inst, handler_func, post) \
4.22 SH_REMOVE_HOOK(ifacetype, ifacefunc, ifaceptr, fastdelegate::MakeDelegate(handler_inst, handler_func), post)
4.23
4.24 @@ -329,12 +329,13 @@
4.25 #endif
4.26
4.27 //////////////////////////////////////////////////////////////////////////
4.28 -#define SH_FHCls(ift, iff, ov) FHCls_##ift##iff##ov
4.29 +#define SH_FHCls(ift, iff, ov) __SourceHook_FHCls_##ift##iff##ov
4.30
4.31 #define SHINT_MAKE_HOOKMANPUBFUNC(ifacetype, ifacefunc, overload, funcptr) \
4.32 - static int HookManPubFunc(HookManagerAction action, HookManagerInfo *param) \
4.33 + static int HookManPubFunc(::SourceHook::HookManagerAction action, ::SourceHook::HookManagerInfo *param) \
4.34 { \
4.35 - if (action == HA_GetInfo) \
4.36 + using namespace ::SourceHook; \
4.37 + if (action == ::SourceHook::HA_GetInfo) \
4.38 { \
4.39 param->proto = ms_Proto; \
4.40 MemFuncInfo mfi; \
4.41 @@ -347,12 +348,12 @@
4.42 reinterpret_cast<void**>(reinterpret_cast<char*>(&ms_Inst) + mfi.vtbloffs)[mfi.vtblindex]; \
4.43 return 0; \
4.44 } \
4.45 - else if (action == HA_Register) \
4.46 + else if (action == ::SourceHook::HA_Register) \
4.47 { \
4.48 ms_HI = param; \
4.49 return 0; \
4.50 } \
4.51 - else if (action == HA_Unregister) \
4.52 + else if (action == ::SourceHook::HA_Unregister) \
4.53 { \
4.54 ms_HI = NULL; \
4.55 return 0; \
4.56 @@ -361,49 +362,52 @@
4.57 return 1; \
4.58 }
4.59
4.60 +// It has to be possible to use the macros in namespaces
4.61 +// -> So we need to access and extend the global SourceHook namespace
4.62 +// We use a namespace alias for this
4.63 #define SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, funcptr) \
4.64 - namespace SourceHook \
4.65 + struct SH_FHCls(ifacetype,ifacefunc,overload) \
4.66 { \
4.67 - struct SH_FHCls(ifacetype,ifacefunc,overload) \
4.68 - { \
4.69 - static SH_FHCls(ifacetype,ifacefunc,overload) ms_Inst; \
4.70 - static HookManagerInfo *ms_HI; \
4.71 - static const char *ms_Proto; \
4.72 - SHINT_MAKE_HOOKMANPUBFUNC(ifacetype, ifacefunc, overload, funcptr)
4.73 + static SH_FHCls(ifacetype,ifacefunc,overload) ms_Inst; \
4.74 + static ::SourceHook::HookManagerInfo *ms_HI; \
4.75 + static const char *ms_Proto; \
4.76 + SHINT_MAKE_HOOKMANPUBFUNC(ifacetype, ifacefunc, overload, funcptr)
4.77
4.78 #define SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, proto, funcptr) \
4.79 - }; \
4.80 - const char *SH_FHCls(ifacetype,ifacefunc,overload)::ms_Proto = proto; \
4.81 - SH_FHCls(ifacetype,ifacefunc,overload) SH_FHCls(ifacetype,ifacefunc,overload)::ms_Inst; \
4.82 - HookManagerInfo *SH_FHCls(ifacetype,ifacefunc,overload)::ms_HI; \
4.83 - bool SH_FHAdd##ifacetype##ifacefunc(void *iface, bool post, \
4.84 - SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
4.85 - { \
4.86 - MemFuncInfo mfi; \
4.87 - GetFuncInfo(funcptr, mfi); \
4.88 - if (mfi.thisptroffs < 0) \
4.89 - return false; /* No virtual inheritance supported */ \
4.90 - \
4.91 - return SH_GLOB_SHPTR->AddHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
4.92 - SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, \
4.93 - new CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD>(handler), post); \
4.94 - } \
4.95 - bool SH_FHRemove##ifacetype##ifacefunc(void *iface, bool post, \
4.96 - SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
4.97 - { \
4.98 - MemFuncInfo mfi; \
4.99 - GetFuncInfo(funcptr, mfi); \
4.100 - if (mfi.thisptroffs < 0) \
4.101 - return false; /* No virtual inheritance supported */ \
4.102 - \
4.103 - CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD> tmp(handler); \
4.104 - return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
4.105 - SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, &tmp, post); \
4.106 - } \
4.107 - }
4.108 + }; \
4.109 + const char *SH_FHCls(ifacetype,ifacefunc,overload)::ms_Proto = proto; \
4.110 + SH_FHCls(ifacetype,ifacefunc,overload) SH_FHCls(ifacetype,ifacefunc,overload)::ms_Inst; \
4.111 + ::SourceHook::HookManagerInfo *SH_FHCls(ifacetype,ifacefunc,overload)::ms_HI; \
4.112 + bool __SourceHook_FHAdd##ifacetype##ifacefunc(void *iface, bool post, \
4.113 + SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
4.114 + { \
4.115 + using namespace ::SourceHook; \
4.116 + MemFuncInfo mfi; \
4.117 + GetFuncInfo(funcptr, mfi); \
4.118 + if (mfi.thisptroffs < 0) \
4.119 + return false; /* No virtual inheritance supported */ \
4.120 + \
4.121 + return SH_GLOB_SHPTR->AddHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
4.122 + SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, \
4.123 + new CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD>(handler), post); \
4.124 + } \
4.125 + bool __SourceHook_FHRemove##ifacetype##ifacefunc(void *iface, bool post, \
4.126 + SH_FHCls(ifacetype,ifacefunc,overload)::FD handler) \
4.127 + { \
4.128 + using namespace ::SourceHook; \
4.129 + MemFuncInfo mfi; \
4.130 + GetFuncInfo(funcptr, mfi); \
4.131 + if (mfi.thisptroffs < 0) \
4.132 + return false; /* No virtual inheritance supported */ \
4.133 + \
4.134 + CSHDelegate<SH_FHCls(ifacetype,ifacefunc,overload)::FD> tmp(handler); \
4.135 + return SH_GLOB_SHPTR->RemoveHook(SH_GLOB_PLUGPTR, iface, mfi.thisptroffs, \
4.136 + SH_FHCls(ifacetype,ifacefunc,overload)::HookManPubFunc, &tmp, post); \
4.137 + } \
4.138
4.139 #define SH_SETUPCALLS(rettype, paramtypes, params) \
4.140 /* 1) Find the vfnptr */ \
4.141 + using namespace ::SourceHook; \
4.142 void *ourvfnptr = reinterpret_cast<void*>( \
4.143 *reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_HI->vtbl_offs) + ms_HI->vtbl_idx); \
4.144 \
4.145 @@ -428,7 +432,9 @@
4.146 /* 2) Declare some vars and set it up */ \
4.147 std::list<HookManagerInfo::VfnPtr::Iface::Hook> &prelist = ci.hooks_pre; \
4.148 std::list<HookManagerInfo::VfnPtr::Iface::Hook> &postlist = ci.hooks_post; \
4.149 - rettype orig_ret, override_ret, plugin_ret; \
4.150 + rettype orig_ret; \
4.151 + rettype override_ret; \
4.152 + rettype plugin_ret; \
4.153 META_RES &cur_res = SH_GLOB_SHPTR->GetCurResRef(); \
4.154 META_RES &prev_res = SH_GLOB_SHPTR->GetPrevResRef(); \
4.155 META_RES &status = SH_GLOB_SHPTR->GetStatusRef(); \
4.156 @@ -476,6 +482,7 @@
4.157
4.158 //////////////////////////////////////////////////////////////////////////
4.159 #define SH_SETUPCALLS_void(paramtypes, params) \
4.160 + using namespace ::SourceHook; \
4.161 /* 1) Find the vfnptr */ \
4.162 void *ourvfnptr = reinterpret_cast<void*>( \
4.163 *reinterpret_cast<void***>(reinterpret_cast<char*>(this) + ms_HI->vtbl_offs) + ms_HI->vtbl_idx); \
4.164 @@ -558,28 +565,28 @@
4.165
4.166 // ********* Support for 0 arguments *********
4.167 #define SH_DECL_HOOK0(ifacetype, ifacefunc, attr, overload, rettype) \
4.168 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)()> \
4.169 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)() attr> \
4.170 (&ifacetype::ifacefunc))) \
4.171 typedef fastdelegate::FastDelegate0<rettype> FD; \
4.172 - virtual rettype Func() attr \
4.173 + virtual rettype Func() \
4.174 { SH_HANDLEFUNC(ifacetype, ifacefunc, (), (), rettype); } \
4.175 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype , \
4.176 - (static_cast<rettype (ifacetype::*)()>(&ifacetype::ifacefunc)))
4.177 + (static_cast<rettype (ifacetype::*)() attr>(&ifacetype::ifacefunc)))
4.178
4.179 #define SH_DECL_HOOK0_void(ifacetype, ifacefunc, attr, overload) \
4.180 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)()> \
4.181 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)() attr> \
4.182 (&ifacetype::ifacefunc))) \
4.183 typedef fastdelegate::FastDelegate0<> FD; \
4.184 - virtual void Func() attr \
4.185 + virtual void Func() \
4.186 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (), ()); } \
4.187 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr , \
4.188 - (static_cast<void (ifacetype::*)()>(&ifacetype::ifacefunc)))
4.189 + (static_cast<void (ifacetype::*)() attr>(&ifacetype::ifacefunc)))
4.190
4.191 #define SH_DECL_HOOK0_vafmt(ifacetype, ifacefunc, attr, overload, rettype) \
4.192 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(const char *, ...)> \
4.193 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(const char *, ...) attr> \
4.194 (&ifacetype::ifacefunc))) \
4.195 typedef fastdelegate::FastDelegate1<const char *, rettype> FD; \
4.196 - virtual rettype Func(const char *fmt, ...) attr \
4.197 + virtual rettype Func(const char *fmt, ...) \
4.198 { \
4.199 char buf[STRBUF_LEN]; \
4.200 va_list ap; \
4.201 @@ -589,13 +596,13 @@
4.202 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (...), ("%s", buf), (buf), rettype); \
4.203 } \
4.204 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|const char*|...", \
4.205 - (static_cast<rettype (ifacetype::*)(const char *, ...)>(&ifacetype::ifacefunc)))
4.206 + (static_cast<rettype (ifacetype::*)(const char *, ...) attr>(&ifacetype::ifacefunc)))
4.207
4.208 #define SH_DECL_HOOK0_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype) \
4.209 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(const char *, ...)> \
4.210 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(const char *, ...) attr> \
4.211 (&ifacetype::ifacefunc))) \
4.212 typedef fastdelegate::FastDelegate1<const char *> FD; \
4.213 - virtual void Func(const char *, ...) attr \
4.214 + virtual void Func(const char *, ...) \
4.215 { \
4.216 char buf[STRBUF_LEN]; \
4.217 va_list ap; \
4.218 @@ -605,32 +612,32 @@
4.219 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (...), ("%s", buf), (buf)); \
4.220 } \
4.221 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|const char*|...", \
4.222 - (static_cast<void (ifacetype::*)(const char *, ...)>(&ifacetype::ifacefunc)))
4.223 + (static_cast<void (ifacetype::*)(const char *, ...) attr>(&ifacetype::ifacefunc)))
4.224
4.225 // ********* Support for 1 arguments *********
4.226 #define SH_DECL_HOOK1(ifacetype, ifacefunc, attr, overload, rettype, param1) \
4.227 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1)> \
4.228 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1) attr> \
4.229 (&ifacetype::ifacefunc))) \
4.230 typedef fastdelegate::FastDelegate1<param1, rettype> FD; \
4.231 - virtual rettype Func(param1 p1) attr \
4.232 + virtual rettype Func(param1 p1) \
4.233 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1), (p1), rettype); } \
4.234 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1, \
4.235 - (static_cast<rettype (ifacetype::*)(param1)>(&ifacetype::ifacefunc)))
4.236 + (static_cast<rettype (ifacetype::*)(param1) attr>(&ifacetype::ifacefunc)))
4.237
4.238 #define SH_DECL_HOOK1_void(ifacetype, ifacefunc, attr, overload, param1) \
4.239 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1)> \
4.240 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1) attr> \
4.241 (&ifacetype::ifacefunc))) \
4.242 typedef fastdelegate::FastDelegate1<param1> FD; \
4.243 - virtual void Func(param1 p1) attr \
4.244 + virtual void Func(param1 p1) \
4.245 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1), (p1)); } \
4.246 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1, \
4.247 - (static_cast<void (ifacetype::*)(param1)>(&ifacetype::ifacefunc)))
4.248 + (static_cast<void (ifacetype::*)(param1) attr>(&ifacetype::ifacefunc)))
4.249
4.250 #define SH_DECL_HOOK1_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1) \
4.251 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, const char *, ...)> \
4.252 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, const char *, ...) attr> \
4.253 (&ifacetype::ifacefunc))) \
4.254 typedef fastdelegate::FastDelegate2<param1, const char *, rettype> FD; \
4.255 - virtual rettype Func(param1 p1, const char *fmt, ...) attr \
4.256 + virtual rettype Func(param1 p1, const char *fmt, ...) \
4.257 { \
4.258 char buf[STRBUF_LEN]; \
4.259 va_list ap; \
4.260 @@ -640,13 +647,13 @@
4.261 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, ...), (p1, "%s", buf), (p1, buf), rettype); \
4.262 } \
4.263 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|const char*|...", \
4.264 - (static_cast<rettype (ifacetype::*)(param1, const char *, ...)>(&ifacetype::ifacefunc)))
4.265 + (static_cast<rettype (ifacetype::*)(param1, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.266
4.267 #define SH_DECL_HOOK1_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1) \
4.268 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, const char *, ...)> \
4.269 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, const char *, ...) attr> \
4.270 (&ifacetype::ifacefunc))) \
4.271 typedef fastdelegate::FastDelegate2<param1, const char *> FD; \
4.272 - virtual void Func(param1 p1, const char *, ...) attr \
4.273 + virtual void Func(param1 p1, const char *, ...) \
4.274 { \
4.275 char buf[STRBUF_LEN]; \
4.276 va_list ap; \
4.277 @@ -656,32 +663,32 @@
4.278 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, ...), (p1, "%s", buf), (p1, buf)); \
4.279 } \
4.280 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|const char*|...", \
4.281 - (static_cast<void (ifacetype::*)(param1, const char *, ...)>(&ifacetype::ifacefunc)))
4.282 + (static_cast<void (ifacetype::*)(param1, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.283
4.284 // ********* Support for 2 arguments *********
4.285 #define SH_DECL_HOOK2(ifacetype, ifacefunc, attr, overload, rettype, param1, param2) \
4.286 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2)> \
4.287 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2) attr> \
4.288 (&ifacetype::ifacefunc))) \
4.289 typedef fastdelegate::FastDelegate2<param1, param2, rettype> FD; \
4.290 - virtual rettype Func(param1 p1, param2 p2) attr \
4.291 + virtual rettype Func(param1 p1, param2 p2) \
4.292 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2), (p1, p2), rettype); } \
4.293 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2, \
4.294 - (static_cast<rettype (ifacetype::*)(param1, param2)>(&ifacetype::ifacefunc)))
4.295 + (static_cast<rettype (ifacetype::*)(param1, param2) attr>(&ifacetype::ifacefunc)))
4.296
4.297 #define SH_DECL_HOOK2_void(ifacetype, ifacefunc, attr, overload, param1, param2) \
4.298 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2)> \
4.299 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2) attr> \
4.300 (&ifacetype::ifacefunc))) \
4.301 typedef fastdelegate::FastDelegate2<param1, param2> FD; \
4.302 - virtual void Func(param1 p1, param2 p2) attr \
4.303 + virtual void Func(param1 p1, param2 p2) \
4.304 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2), (p1, p2)); } \
4.305 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2, \
4.306 - (static_cast<void (ifacetype::*)(param1, param2)>(&ifacetype::ifacefunc)))
4.307 + (static_cast<void (ifacetype::*)(param1, param2) attr>(&ifacetype::ifacefunc)))
4.308
4.309 #define SH_DECL_HOOK2_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2) \
4.310 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, const char *, ...)> \
4.311 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, const char *, ...) attr> \
4.312 (&ifacetype::ifacefunc))) \
4.313 typedef fastdelegate::FastDelegate3<param1, param2, const char *, rettype> FD; \
4.314 - virtual rettype Func(param1 p1, param2 p2, const char *fmt, ...) attr \
4.315 + virtual rettype Func(param1 p1, param2 p2, const char *fmt, ...) \
4.316 { \
4.317 char buf[STRBUF_LEN]; \
4.318 va_list ap; \
4.319 @@ -691,13 +698,13 @@
4.320 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, ...), (p1, p2, "%s", buf), (p1, p2, buf), rettype); \
4.321 } \
4.322 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|const char*|...", \
4.323 - (static_cast<rettype (ifacetype::*)(param1, param2, const char *, ...)>(&ifacetype::ifacefunc)))
4.324 + (static_cast<rettype (ifacetype::*)(param1, param2, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.325
4.326 #define SH_DECL_HOOK2_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2) \
4.327 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, const char *, ...)> \
4.328 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, const char *, ...) attr> \
4.329 (&ifacetype::ifacefunc))) \
4.330 typedef fastdelegate::FastDelegate3<param1, param2, const char *> FD; \
4.331 - virtual void Func(param1 p1, param2 p2, const char *, ...) attr \
4.332 + virtual void Func(param1 p1, param2 p2, const char *, ...) \
4.333 { \
4.334 char buf[STRBUF_LEN]; \
4.335 va_list ap; \
4.336 @@ -707,32 +714,32 @@
4.337 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, ...), (p1, p2, "%s", buf), (p1, p2, buf)); \
4.338 } \
4.339 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|const char*|...", \
4.340 - (static_cast<void (ifacetype::*)(param1, param2, const char *, ...)>(&ifacetype::ifacefunc)))
4.341 + (static_cast<void (ifacetype::*)(param1, param2, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.342
4.343 // ********* Support for 3 arguments *********
4.344 #define SH_DECL_HOOK3(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3) \
4.345 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3)> \
4.346 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3) attr> \
4.347 (&ifacetype::ifacefunc))) \
4.348 typedef fastdelegate::FastDelegate3<param1, param2, param3, rettype> FD; \
4.349 - virtual rettype Func(param1 p1, param2 p2, param3 p3) attr \
4.350 + virtual rettype Func(param1 p1, param2 p2, param3 p3) \
4.351 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3), (p1, p2, p3), rettype); } \
4.352 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3, \
4.353 - (static_cast<rettype (ifacetype::*)(param1, param2, param3)>(&ifacetype::ifacefunc)))
4.354 + (static_cast<rettype (ifacetype::*)(param1, param2, param3) attr>(&ifacetype::ifacefunc)))
4.355
4.356 #define SH_DECL_HOOK3_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3) \
4.357 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3)> \
4.358 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3) attr> \
4.359 (&ifacetype::ifacefunc))) \
4.360 typedef fastdelegate::FastDelegate3<param1, param2, param3> FD; \
4.361 - virtual void Func(param1 p1, param2 p2, param3 p3) attr \
4.362 + virtual void Func(param1 p1, param2 p2, param3 p3) \
4.363 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3), (p1, p2, p3)); } \
4.364 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3, \
4.365 - (static_cast<void (ifacetype::*)(param1, param2, param3)>(&ifacetype::ifacefunc)))
4.366 + (static_cast<void (ifacetype::*)(param1, param2, param3) attr>(&ifacetype::ifacefunc)))
4.367
4.368 #define SH_DECL_HOOK3_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3) \
4.369 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, const char *, ...)> \
4.370 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, const char *, ...) attr> \
4.371 (&ifacetype::ifacefunc))) \
4.372 typedef fastdelegate::FastDelegate4<param1, param2, param3, const char *, rettype> FD; \
4.373 - virtual rettype Func(param1 p1, param2 p2, param3 p3, const char *fmt, ...) attr \
4.374 + virtual rettype Func(param1 p1, param2 p2, param3 p3, const char *fmt, ...) \
4.375 { \
4.376 char buf[STRBUF_LEN]; \
4.377 va_list ap; \
4.378 @@ -742,13 +749,13 @@
4.379 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, ...), (p1, p2, p3, "%s", buf), (p1, p2, p3, buf), rettype); \
4.380 } \
4.381 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|const char*|...", \
4.382 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, const char *, ...)>(&ifacetype::ifacefunc)))
4.383 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.384
4.385 #define SH_DECL_HOOK3_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3) \
4.386 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, const char *, ...)> \
4.387 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, const char *, ...) attr> \
4.388 (&ifacetype::ifacefunc))) \
4.389 typedef fastdelegate::FastDelegate4<param1, param2, param3, const char *> FD; \
4.390 - virtual void Func(param1 p1, param2 p2, param3 p3, const char *, ...) attr \
4.391 + virtual void Func(param1 p1, param2 p2, param3 p3, const char *, ...) \
4.392 { \
4.393 char buf[STRBUF_LEN]; \
4.394 va_list ap; \
4.395 @@ -758,32 +765,32 @@
4.396 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, ...), (p1, p2, p3, "%s", buf), (p1, p2, p3, buf)); \
4.397 } \
4.398 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|const char*|...", \
4.399 - (static_cast<void (ifacetype::*)(param1, param2, param3, const char *, ...)>(&ifacetype::ifacefunc)))
4.400 + (static_cast<void (ifacetype::*)(param1, param2, param3, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.401
4.402 // ********* Support for 4 arguments *********
4.403 #define SH_DECL_HOOK4(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4) \
4.404 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4)> \
4.405 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4) attr> \
4.406 (&ifacetype::ifacefunc))) \
4.407 typedef fastdelegate::FastDelegate4<param1, param2, param3, param4, rettype> FD; \
4.408 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4) attr \
4.409 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4) \
4.410 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4), (p1, p2, p3, p4), rettype); } \
4.411 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4, \
4.412 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4)>(&ifacetype::ifacefunc)))
4.413 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4) attr>(&ifacetype::ifacefunc)))
4.414
4.415 #define SH_DECL_HOOK4_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4) \
4.416 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4)> \
4.417 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4) attr> \
4.418 (&ifacetype::ifacefunc))) \
4.419 typedef fastdelegate::FastDelegate4<param1, param2, param3, param4> FD; \
4.420 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4) attr \
4.421 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4) \
4.422 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4), (p1, p2, p3, p4)); } \
4.423 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4, \
4.424 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4)>(&ifacetype::ifacefunc)))
4.425 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4) attr>(&ifacetype::ifacefunc)))
4.426
4.427 #define SH_DECL_HOOK4_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4) \
4.428 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, const char *, ...)> \
4.429 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, const char *, ...) attr> \
4.430 (&ifacetype::ifacefunc))) \
4.431 typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, const char *, rettype> FD; \
4.432 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, const char *fmt, ...) attr \
4.433 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, const char *fmt, ...) \
4.434 { \
4.435 char buf[STRBUF_LEN]; \
4.436 va_list ap; \
4.437 @@ -793,13 +800,13 @@
4.438 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, ...), (p1, p2, p3, p4, "%s", buf), (p1, p2, p3, p4, buf), rettype); \
4.439 } \
4.440 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|const char*|...", \
4.441 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, const char *, ...)>(&ifacetype::ifacefunc)))
4.442 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.443
4.444 #define SH_DECL_HOOK4_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4) \
4.445 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, const char *, ...)> \
4.446 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, const char *, ...) attr> \
4.447 (&ifacetype::ifacefunc))) \
4.448 typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, const char *> FD; \
4.449 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, const char *, ...) attr \
4.450 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, const char *, ...) \
4.451 { \
4.452 char buf[STRBUF_LEN]; \
4.453 va_list ap; \
4.454 @@ -809,32 +816,32 @@
4.455 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, ...), (p1, p2, p3, p4, "%s", buf), (p1, p2, p3, p4, buf)); \
4.456 } \
4.457 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|const char*|...", \
4.458 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, const char *, ...)>(&ifacetype::ifacefunc)))
4.459 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.460
4.461 // ********* Support for 5 arguments *********
4.462 #define SH_DECL_HOOK5(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5) \
4.463 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5)> \
4.464 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5) attr> \
4.465 (&ifacetype::ifacefunc))) \
4.466 typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, param5, rettype> FD; \
4.467 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) attr \
4.468 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) \
4.469 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5), rettype); } \
4.470 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5, \
4.471 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5)>(&ifacetype::ifacefunc)))
4.472 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5) attr>(&ifacetype::ifacefunc)))
4.473
4.474 #define SH_DECL_HOOK5_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5) \
4.475 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5)> \
4.476 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5) attr> \
4.477 (&ifacetype::ifacefunc))) \
4.478 typedef fastdelegate::FastDelegate5<param1, param2, param3, param4, param5> FD; \
4.479 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) attr \
4.480 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) \
4.481 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5)); } \
4.482 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5, \
4.483 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5)>(&ifacetype::ifacefunc)))
4.484 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5) attr>(&ifacetype::ifacefunc)))
4.485
4.486 #define SH_DECL_HOOK5_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5) \
4.487 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...)> \
4.488 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...) attr> \
4.489 (&ifacetype::ifacefunc))) \
4.490 typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, const char *, rettype> FD; \
4.491 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, const char *fmt, ...) attr \
4.492 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, const char *fmt, ...) \
4.493 { \
4.494 char buf[STRBUF_LEN]; \
4.495 va_list ap; \
4.496 @@ -844,13 +851,13 @@
4.497 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, ...), (p1, p2, p3, p4, p5, "%s", buf), (p1, p2, p3, p4, p5, buf), rettype); \
4.498 } \
4.499 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|const char*|...", \
4.500 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...)>(&ifacetype::ifacefunc)))
4.501 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.502
4.503 #define SH_DECL_HOOK5_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5) \
4.504 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...)> \
4.505 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...) attr> \
4.506 (&ifacetype::ifacefunc))) \
4.507 typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, const char *> FD; \
4.508 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, const char *, ...) attr \
4.509 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, const char *, ...) \
4.510 { \
4.511 char buf[STRBUF_LEN]; \
4.512 va_list ap; \
4.513 @@ -860,32 +867,32 @@
4.514 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, ...), (p1, p2, p3, p4, p5, "%s", buf), (p1, p2, p3, p4, p5, buf)); \
4.515 } \
4.516 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|const char*|...", \
4.517 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...)>(&ifacetype::ifacefunc)))
4.518 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.519
4.520 // ********* Support for 6 arguments *********
4.521 #define SH_DECL_HOOK6(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6) \
4.522 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6)> \
4.523 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6) attr> \
4.524 (&ifacetype::ifacefunc))) \
4.525 typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, param6, rettype> FD; \
4.526 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) attr \
4.527 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) \
4.528 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6), rettype); } \
4.529 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6, \
4.530 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6)>(&ifacetype::ifacefunc)))
4.531 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6) attr>(&ifacetype::ifacefunc)))
4.532
4.533 #define SH_DECL_HOOK6_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6) \
4.534 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6)> \
4.535 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6) attr> \
4.536 (&ifacetype::ifacefunc))) \
4.537 typedef fastdelegate::FastDelegate6<param1, param2, param3, param4, param5, param6> FD; \
4.538 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) attr \
4.539 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) \
4.540 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6)); } \
4.541 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6, \
4.542 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6)>(&ifacetype::ifacefunc)))
4.543 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6) attr>(&ifacetype::ifacefunc)))
4.544
4.545 #define SH_DECL_HOOK6_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6) \
4.546 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...)> \
4.547 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...) attr> \
4.548 (&ifacetype::ifacefunc))) \
4.549 typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, const char *, rettype> FD; \
4.550 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, const char *fmt, ...) attr \
4.551 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, const char *fmt, ...) \
4.552 { \
4.553 char buf[STRBUF_LEN]; \
4.554 va_list ap; \
4.555 @@ -895,13 +902,13 @@
4.556 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, ...), (p1, p2, p3, p4, p5, p6, "%s", buf), (p1, p2, p3, p4, p5, p6, buf), rettype); \
4.557 } \
4.558 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|const char*|...", \
4.559 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...)>(&ifacetype::ifacefunc)))
4.560 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.561
4.562 #define SH_DECL_HOOK6_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6) \
4.563 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...)> \
4.564 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...) attr> \
4.565 (&ifacetype::ifacefunc))) \
4.566 typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, const char *> FD; \
4.567 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, const char *, ...) attr \
4.568 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, const char *, ...) \
4.569 { \
4.570 char buf[STRBUF_LEN]; \
4.571 va_list ap; \
4.572 @@ -911,32 +918,32 @@
4.573 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, ...), (p1, p2, p3, p4, p5, p6, "%s", buf), (p1, p2, p3, p4, p5, p6, buf)); \
4.574 } \
4.575 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|const char*|...", \
4.576 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...)>(&ifacetype::ifacefunc)))
4.577 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.578
4.579 // ********* Support for 7 arguments *********
4.580 #define SH_DECL_HOOK7(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7) \
4.581 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7)> \
4.582 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7) attr> \
4.583 (&ifacetype::ifacefunc))) \
4.584 typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, param7, rettype> FD; \
4.585 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) attr \
4.586 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) \
4.587 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7), rettype); } \
4.588 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7, \
4.589 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7)>(&ifacetype::ifacefunc)))
4.590 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7) attr>(&ifacetype::ifacefunc)))
4.591
4.592 #define SH_DECL_HOOK7_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7) \
4.593 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7)> \
4.594 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7) attr> \
4.595 (&ifacetype::ifacefunc))) \
4.596 typedef fastdelegate::FastDelegate7<param1, param2, param3, param4, param5, param6, param7> FD; \
4.597 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) attr \
4.598 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) \
4.599 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7)); } \
4.600 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7, \
4.601 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7)>(&ifacetype::ifacefunc)))
4.602 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7) attr>(&ifacetype::ifacefunc)))
4.603
4.604 #define SH_DECL_HOOK7_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7) \
4.605 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...)> \
4.606 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...) attr> \
4.607 (&ifacetype::ifacefunc))) \
4.608 typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, const char *, rettype> FD; \
4.609 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, const char *fmt, ...) attr \
4.610 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, const char *fmt, ...) \
4.611 { \
4.612 char buf[STRBUF_LEN]; \
4.613 va_list ap; \
4.614 @@ -946,13 +953,13 @@
4.615 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, ...), (p1, p2, p3, p4, p5, p6, p7, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, buf), rettype); \
4.616 } \
4.617 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|const char*|...", \
4.618 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...)>(&ifacetype::ifacefunc)))
4.619 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.620
4.621 #define SH_DECL_HOOK7_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7) \
4.622 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...)> \
4.623 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...) attr> \
4.624 (&ifacetype::ifacefunc))) \
4.625 typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, const char *> FD; \
4.626 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, const char *, ...) attr \
4.627 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, const char *, ...) \
4.628 { \
4.629 char buf[STRBUF_LEN]; \
4.630 va_list ap; \
4.631 @@ -962,32 +969,32 @@
4.632 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, ...), (p1, p2, p3, p4, p5, p6, p7, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, buf)); \
4.633 } \
4.634 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|const char*|...", \
4.635 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...)>(&ifacetype::ifacefunc)))
4.636 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.637
4.638 // ********* Support for 8 arguments *********
4.639 #define SH_DECL_HOOK8(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
4.640 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8)> \
4.641 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8) attr> \
4.642 (&ifacetype::ifacefunc))) \
4.643 typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, param8, rettype> FD; \
4.644 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) attr \
4.645 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) \
4.646 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8), rettype); } \
4.647 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8, \
4.648 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8)>(&ifacetype::ifacefunc)))
4.649 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8) attr>(&ifacetype::ifacefunc)))
4.650
4.651 #define SH_DECL_HOOK8_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8) \
4.652 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8)> \
4.653 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8) attr> \
4.654 (&ifacetype::ifacefunc))) \
4.655 typedef fastdelegate::FastDelegate8<param1, param2, param3, param4, param5, param6, param7, param8> FD; \
4.656 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) attr \
4.657 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) \
4.658 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8)); } \
4.659 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8, \
4.660 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8)>(&ifacetype::ifacefunc)))
4.661 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8) attr>(&ifacetype::ifacefunc)))
4.662
4.663 #define SH_DECL_HOOK8_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
4.664 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...)> \
4.665 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...) attr> \
4.666 (&ifacetype::ifacefunc))) \
4.667 typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, const char *, rettype> FD; \
4.668 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, const char *fmt, ...) attr \
4.669 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, const char *fmt, ...) \
4.670 { \
4.671 char buf[STRBUF_LEN]; \
4.672 va_list ap; \
4.673 @@ -997,13 +1004,13 @@
4.674 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, ...), (p1, p2, p3, p4, p5, p6, p7, p8, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, buf), rettype); \
4.675 } \
4.676 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|const char*|...", \
4.677 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...)>(&ifacetype::ifacefunc)))
4.678 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.679
4.680 #define SH_DECL_HOOK8_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8) \
4.681 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...)> \
4.682 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...) attr> \
4.683 (&ifacetype::ifacefunc))) \
4.684 typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, const char *> FD; \
4.685 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, const char *, ...) attr \
4.686 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, const char *, ...) \
4.687 { \
4.688 char buf[STRBUF_LEN]; \
4.689 va_list ap; \
4.690 @@ -1013,32 +1020,32 @@
4.691 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, ...), (p1, p2, p3, p4, p5, p6, p7, p8, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, buf)); \
4.692 } \
4.693 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|const char*|...", \
4.694 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...)>(&ifacetype::ifacefunc)))
4.695 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.696
4.697 // ********* Support for 9 arguments *********
4.698 #define SH_DECL_HOOK9(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
4.699 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9)> \
4.700 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9) attr> \
4.701 (&ifacetype::ifacefunc))) \
4.702 typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, param9, rettype> FD; \
4.703 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) attr \
4.704 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) \
4.705 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9), rettype); } \
4.706 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9, \
4.707 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9)>(&ifacetype::ifacefunc)))
4.708 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9) attr>(&ifacetype::ifacefunc)))
4.709
4.710 #define SH_DECL_HOOK9_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
4.711 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9)> \
4.712 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9) attr> \
4.713 (&ifacetype::ifacefunc))) \
4.714 typedef fastdelegate::FastDelegate9<param1, param2, param3, param4, param5, param6, param7, param8, param9> FD; \
4.715 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) attr \
4.716 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) \
4.717 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9)); } \
4.718 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9, \
4.719 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9)>(&ifacetype::ifacefunc)))
4.720 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9) attr>(&ifacetype::ifacefunc)))
4.721
4.722 #define SH_DECL_HOOK9_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
4.723 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...)> \
4.724 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...) attr> \
4.725 (&ifacetype::ifacefunc))) \
4.726 typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, rettype> FD; \
4.727 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, const char *fmt, ...) attr \
4.728 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, const char *fmt, ...) \
4.729 { \
4.730 char buf[STRBUF_LEN]; \
4.731 va_list ap; \
4.732 @@ -1048,13 +1055,13 @@
4.733 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, buf), rettype); \
4.734 } \
4.735 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|const char*|...", \
4.736 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...)>(&ifacetype::ifacefunc)))
4.737 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.738
4.739 #define SH_DECL_HOOK9_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9) \
4.740 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...)> \
4.741 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...) attr> \
4.742 (&ifacetype::ifacefunc))) \
4.743 typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *> FD; \
4.744 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, const char *, ...) attr \
4.745 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, const char *, ...) \
4.746 { \
4.747 char buf[STRBUF_LEN]; \
4.748 va_list ap; \
4.749 @@ -1064,32 +1071,32 @@
4.750 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, buf)); \
4.751 } \
4.752 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|const char*|...", \
4.753 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...)>(&ifacetype::ifacefunc)))
4.754 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.755
4.756 // ********* Support for 10 arguments *********
4.757 #define SH_DECL_HOOK10(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
4.758 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)> \
4.759 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) attr> \
4.760 (&ifacetype::ifacefunc))) \
4.761 typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, rettype> FD; \
4.762 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) attr \
4.763 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) \
4.764 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), rettype); } \
4.765 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10, \
4.766 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)>(&ifacetype::ifacefunc)))
4.767 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) attr>(&ifacetype::ifacefunc)))
4.768
4.769 #define SH_DECL_HOOK10_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
4.770 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)> \
4.771 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) attr> \
4.772 (&ifacetype::ifacefunc))) \
4.773 typedef fastdelegate::FastDelegate10<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10> FD; \
4.774 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) attr \
4.775 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) \
4.776 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10)); } \
4.777 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10, \
4.778 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10)>(&ifacetype::ifacefunc)))
4.779 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) attr>(&ifacetype::ifacefunc)))
4.780
4.781 #define SH_DECL_HOOK10_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
4.782 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...)> \
4.783 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...) attr> \
4.784 (&ifacetype::ifacefunc))) \
4.785 typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, rettype> FD; \
4.786 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, const char *fmt, ...) attr \
4.787 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, const char *fmt, ...) \
4.788 { \
4.789 char buf[STRBUF_LEN]; \
4.790 va_list ap; \
4.791 @@ -1099,13 +1106,13 @@
4.792 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, buf), rettype); \
4.793 } \
4.794 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|const char*|...", \
4.795 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...)>(&ifacetype::ifacefunc)))
4.796 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.797
4.798 #define SH_DECL_HOOK10_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10) \
4.799 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...)> \
4.800 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...) attr> \
4.801 (&ifacetype::ifacefunc))) \
4.802 typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *> FD; \
4.803 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, const char *, ...) attr \
4.804 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, const char *, ...) \
4.805 { \
4.806 char buf[STRBUF_LEN]; \
4.807 va_list ap; \
4.808 @@ -1115,32 +1122,32 @@
4.809 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, buf)); \
4.810 } \
4.811 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|const char*|...", \
4.812 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...)>(&ifacetype::ifacefunc)))
4.813 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.814
4.815 // ********* Support for 11 arguments *********
4.816 #define SH_DECL_HOOK11(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
4.817 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)> \
4.818 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) attr> \
4.819 (&ifacetype::ifacefunc))) \
4.820 typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, rettype> FD; \
4.821 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11) attr \
4.822 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11) \
4.823 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), rettype); } \
4.824 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11, \
4.825 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)>(&ifacetype::ifacefunc)))
4.826 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) attr>(&ifacetype::ifacefunc)))
4.827
4.828 #define SH_DECL_HOOK11_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
4.829 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)> \
4.830 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) attr> \
4.831 (&ifacetype::ifacefunc))) \
4.832 typedef fastdelegate::FastDelegate11<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11> FD; \
4.833 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11) attr \
4.834 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11) \
4.835 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11)); } \
4.836 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11, \
4.837 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11)>(&ifacetype::ifacefunc)))
4.838 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) attr>(&ifacetype::ifacefunc)))
4.839
4.840 #define SH_DECL_HOOK11_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
4.841 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...)> \
4.842 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...) attr> \
4.843 (&ifacetype::ifacefunc))) \
4.844 typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, rettype> FD; \
4.845 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, const char *fmt, ...) attr \
4.846 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, const char *fmt, ...) \
4.847 { \
4.848 char buf[STRBUF_LEN]; \
4.849 va_list ap; \
4.850 @@ -1150,13 +1157,13 @@
4.851 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, buf), rettype); \
4.852 } \
4.853 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|const char*|...", \
4.854 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...)>(&ifacetype::ifacefunc)))
4.855 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.856
4.857 #define SH_DECL_HOOK11_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11) \
4.858 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...)> \
4.859 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...) attr> \
4.860 (&ifacetype::ifacefunc))) \
4.861 typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *> FD; \
4.862 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, const char *, ...) attr \
4.863 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, const char *, ...) \
4.864 { \
4.865 char buf[STRBUF_LEN]; \
4.866 va_list ap; \
4.867 @@ -1166,32 +1173,32 @@
4.868 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, buf)); \
4.869 } \
4.870 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|const char*|...", \
4.871 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...)>(&ifacetype::ifacefunc)))
4.872 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.873
4.874 // ********* Support for 12 arguments *********
4.875 #define SH_DECL_HOOK12(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
4.876 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)> \
4.877 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) attr> \
4.878 (&ifacetype::ifacefunc))) \
4.879 typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, rettype> FD; \
4.880 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12) attr \
4.881 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12) \
4.882 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12), rettype); } \
4.883 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12, \
4.884 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)>(&ifacetype::ifacefunc)))
4.885 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) attr>(&ifacetype::ifacefunc)))
4.886
4.887 #define SH_DECL_HOOK12_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
4.888 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)> \
4.889 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) attr> \
4.890 (&ifacetype::ifacefunc))) \
4.891 typedef fastdelegate::FastDelegate12<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12> FD; \
4.892 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12) attr \
4.893 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12) \
4.894 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12)); } \
4.895 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12, \
4.896 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12)>(&ifacetype::ifacefunc)))
4.897 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) attr>(&ifacetype::ifacefunc)))
4.898
4.899 #define SH_DECL_HOOK12_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
4.900 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...)> \
4.901 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...) attr> \
4.902 (&ifacetype::ifacefunc))) \
4.903 typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, rettype> FD; \
4.904 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, const char *fmt, ...) attr \
4.905 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, const char *fmt, ...) \
4.906 { \
4.907 char buf[STRBUF_LEN]; \
4.908 va_list ap; \
4.909 @@ -1201,13 +1208,13 @@
4.910 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, buf), rettype); \
4.911 } \
4.912 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|const char*|...", \
4.913 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...)>(&ifacetype::ifacefunc)))
4.914 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.915
4.916 #define SH_DECL_HOOK12_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12) \
4.917 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...)> \
4.918 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...) attr> \
4.919 (&ifacetype::ifacefunc))) \
4.920 typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *> FD; \
4.921 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, const char *, ...) attr \
4.922 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, const char *, ...) \
4.923 { \
4.924 char buf[STRBUF_LEN]; \
4.925 va_list ap; \
4.926 @@ -1217,32 +1224,32 @@
4.927 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, buf)); \
4.928 } \
4.929 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|const char*|...", \
4.930 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...)>(&ifacetype::ifacefunc)))
4.931 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.932
4.933 // ********* Support for 13 arguments *********
4.934 #define SH_DECL_HOOK13(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
4.935 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13)> \
4.936 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) attr> \
4.937 (&ifacetype::ifacefunc))) \
4.938 typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, rettype> FD; \
4.939 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13) attr \
4.940 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13) \
4.941 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13), rettype); } \
4.942 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13, \
4.943 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13)>(&ifacetype::ifacefunc)))
4.944 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) attr>(&ifacetype::ifacefunc)))
4.945
4.946 #define SH_DECL_HOOK13_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
4.947 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13)> \
4.948 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) attr> \
4.949 (&ifacetype::ifacefunc))) \
4.950 typedef fastdelegate::FastDelegate13<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13> FD; \
4.951 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13) attr \
4.952 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13) \
4.953 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13)); } \
4.954 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13, \
4.955 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13)>(&ifacetype::ifacefunc)))
4.956 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) attr>(&ifacetype::ifacefunc)))
4.957
4.958 #define SH_DECL_HOOK13_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
4.959 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...)> \
4.960 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...) attr> \
4.961 (&ifacetype::ifacefunc))) \
4.962 typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, rettype> FD; \
4.963 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, const char *fmt, ...) attr \
4.964 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, const char *fmt, ...) \
4.965 { \
4.966 char buf[STRBUF_LEN]; \
4.967 va_list ap; \
4.968 @@ -1252,13 +1259,13 @@
4.969 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, buf), rettype); \
4.970 } \
4.971 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|const char*|...", \
4.972 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...)>(&ifacetype::ifacefunc)))
4.973 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.974
4.975 #define SH_DECL_HOOK13_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13) \
4.976 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...)> \
4.977 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...) attr> \
4.978 (&ifacetype::ifacefunc))) \
4.979 typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *> FD; \
4.980 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, const char *, ...) attr \
4.981 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, const char *, ...) \
4.982 { \
4.983 char buf[STRBUF_LEN]; \
4.984 va_list ap; \
4.985 @@ -1268,32 +1275,32 @@
4.986 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, buf)); \
4.987 } \
4.988 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|const char*|...", \
4.989 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...)>(&ifacetype::ifacefunc)))
4.990 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.991
4.992 // ********* Support for 14 arguments *********
4.993 #define SH_DECL_HOOK14(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
4.994 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14)> \
4.995 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) attr> \
4.996 (&ifacetype::ifacefunc))) \
4.997 typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, rettype> FD; \
4.998 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14) attr \
4.999 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14) \
4.1000 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14), rettype); } \
4.1001 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14, \
4.1002 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14)>(&ifacetype::ifacefunc)))
4.1003 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) attr>(&ifacetype::ifacefunc)))
4.1004
4.1005 #define SH_DECL_HOOK14_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
4.1006 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14)> \
4.1007 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) attr> \
4.1008 (&ifacetype::ifacefunc))) \
4.1009 typedef fastdelegate::FastDelegate14<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14> FD; \
4.1010 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14) attr \
4.1011 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14) \
4.1012 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14)); } \
4.1013 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14, \
4.1014 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14)>(&ifacetype::ifacefunc)))
4.1015 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) attr>(&ifacetype::ifacefunc)))
4.1016
4.1017 #define SH_DECL_HOOK14_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
4.1018 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...)> \
4.1019 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...) attr> \
4.1020 (&ifacetype::ifacefunc))) \
4.1021 typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, rettype> FD; \
4.1022 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, const char *fmt, ...) attr \
4.1023 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, const char *fmt, ...) \
4.1024 { \
4.1025 char buf[STRBUF_LEN]; \
4.1026 va_list ap; \
4.1027 @@ -1303,13 +1310,13 @@
4.1028 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, buf), rettype); \
4.1029 } \
4.1030 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|const char*|...", \
4.1031 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...)>(&ifacetype::ifacefunc)))
4.1032 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.1033
4.1034 #define SH_DECL_HOOK14_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14) \
4.1035 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...)> \
4.1036 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...) attr> \
4.1037 (&ifacetype::ifacefunc))) \
4.1038 typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *> FD; \
4.1039 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, const char *, ...) attr \
4.1040 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, const char *, ...) \
4.1041 { \
4.1042 char buf[STRBUF_LEN]; \
4.1043 va_list ap; \
4.1044 @@ -1319,32 +1326,32 @@
4.1045 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, buf)); \
4.1046 } \
4.1047 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|const char*|...", \
4.1048 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...)>(&ifacetype::ifacefunc)))
4.1049 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.1050
4.1051 // ********* Support for 15 arguments *********
4.1052 #define SH_DECL_HOOK15(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
4.1053 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15)> \
4.1054 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) attr> \
4.1055 (&ifacetype::ifacefunc))) \
4.1056 typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, rettype> FD; \
4.1057 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15) attr \
4.1058 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15) \
4.1059 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15), rettype); } \
4.1060 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15, \
4.1061 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15)>(&ifacetype::ifacefunc)))
4.1062 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) attr>(&ifacetype::ifacefunc)))
4.1063
4.1064 #define SH_DECL_HOOK15_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
4.1065 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15)> \
4.1066 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) attr> \
4.1067 (&ifacetype::ifacefunc))) \
4.1068 typedef fastdelegate::FastDelegate15<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15> FD; \
4.1069 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15) attr \
4.1070 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15) \
4.1071 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15)); } \
4.1072 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15, \
4.1073 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15)>(&ifacetype::ifacefunc)))
4.1074 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) attr>(&ifacetype::ifacefunc)))
4.1075
4.1076 #define SH_DECL_HOOK15_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
4.1077 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...)> \
4.1078 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...) attr> \
4.1079 (&ifacetype::ifacefunc))) \
4.1080 typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, rettype> FD; \
4.1081 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, const char *fmt, ...) attr \
4.1082 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, const char *fmt, ...) \
4.1083 { \
4.1084 char buf[STRBUF_LEN]; \
4.1085 va_list ap; \
4.1086 @@ -1354,13 +1361,13 @@
4.1087 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, buf), rettype); \
4.1088 } \
4.1089 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|const char*|...", \
4.1090 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...)>(&ifacetype::ifacefunc)))
4.1091 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.1092
4.1093 #define SH_DECL_HOOK15_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15) \
4.1094 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...)> \
4.1095 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...) attr> \
4.1096 (&ifacetype::ifacefunc))) \
4.1097 typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *> FD; \
4.1098 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, const char *, ...) attr \
4.1099 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, const char *, ...) \
4.1100 { \
4.1101 char buf[STRBUF_LEN]; \
4.1102 va_list ap; \
4.1103 @@ -1370,32 +1377,32 @@
4.1104 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, buf)); \
4.1105 } \
4.1106 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|const char*|...", \
4.1107 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...)>(&ifacetype::ifacefunc)))
4.1108 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.1109
4.1110 // ********* Support for 16 arguments *********
4.1111 #define SH_DECL_HOOK16(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
4.1112 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16)> \
4.1113 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) attr> \
4.1114 (&ifacetype::ifacefunc))) \
4.1115 typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, rettype> FD; \
4.1116 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16) attr \
4.1117 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16) \
4.1118 { SH_HANDLEFUNC(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16), rettype); } \
4.1119 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16, \
4.1120 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16)>(&ifacetype::ifacefunc)))
4.1121 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) attr>(&ifacetype::ifacefunc)))
4.1122
4.1123 #define SH_DECL_HOOK16_void(ifacetype, ifacefunc, attr, overload, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
4.1124 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16)> \
4.1125 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) attr> \
4.1126 (&ifacetype::ifacefunc))) \
4.1127 typedef fastdelegate::FastDelegate16<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16> FD; \
4.1128 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16) attr \
4.1129 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16) \
4.1130 { SH_HANDLEFUNC_void(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16)); } \
4.1131 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16, \
4.1132 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16)>(&ifacetype::ifacefunc)))
4.1133 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) attr>(&ifacetype::ifacefunc)))
4.1134
4.1135 #define SH_DECL_HOOK16_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
4.1136 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...)> \
4.1137 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...) attr> \
4.1138 (&ifacetype::ifacefunc))) \
4.1139 typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, rettype> FD; \
4.1140 - virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, const char *fmt, ...) attr \
4.1141 + virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, const char *fmt, ...) \
4.1142 { \
4.1143 char buf[STRBUF_LEN]; \
4.1144 va_list ap; \
4.1145 @@ -1405,13 +1412,13 @@
4.1146 SH_HANDLEFUNC_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, buf), rettype); \
4.1147 } \
4.1148 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #rettype "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|const char*|...", \
4.1149 - (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...)>(&ifacetype::ifacefunc)))
4.1150 + (static_cast<rettype (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.1151
4.1152 #define SH_DECL_HOOK16_void_vafmt(ifacetype, ifacefunc, attr, overload, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16) \
4.1153 - SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...)> \
4.1154 + SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...) attr> \
4.1155 (&ifacetype::ifacefunc))) \
4.1156 typedef fastdelegate::FastDelegate17<param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *> FD; \
4.1157 - virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, const char *, ...) attr \
4.1158 + virtual void Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10, param11 p11, param12 p12, param13 p13, param14 p14, param15 p15, param16 p16, const char *, ...) \
4.1159 { \
4.1160 char buf[STRBUF_LEN]; \
4.1161 va_list ap; \
4.1162 @@ -1421,7 +1428,7 @@
4.1163 SH_HANDLEFUNC_void_vafmt(ifacetype, ifacefunc, (param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, ...), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, "%s", buf), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, buf)); \
4.1164 } \
4.1165 SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, #attr "|" #param1 "|" #param2 "|" #param3 "|" #param4 "|" #param5 "|" #param6 "|" #param7 "|" #param8 "|" #param9 "|" #param10 "|" #param11 "|" #param12 "|" #param13 "|" #param14 "|" #param15 "|" #param16 "|const char*|...", \
4.1166 - (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...)>(&ifacetype::ifacefunc)))
4.1167 + (static_cast<void (ifacetype::*)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, const char *, ...) attr>(&ifacetype::ifacefunc)))
4.1168
4.1169
4.1170
4.1171 @@ -1431,6 +1438,7 @@
4.1172
4.1173 #define SH_MAKE_EXECUTABLECLASS_OB(call, prms) \
4.1174 { \
4.1175 + using namespace ::SourceHook; \
4.1176 MemFuncInfo mfi; \
4.1177 MFI_Impl<sizeof(m_MFP)>::GetFuncInfo(m_MFP, mfi); \
4.1178 OrigVTables::const_iterator iter = m_CC->vt.find(mfi.vtbloffs); \
4.1179 @@ -1461,7 +1469,7 @@
4.1180 }
4.1181
4.1182 // Support for 0 arguments
4.1183 - template<> RetType operator()() const
4.1184 + RetType operator()() const
4.1185 SH_MAKE_EXECUTABLECLASS_OB((), ())
4.1186
4.1187 // Support for 1 arguments
4.1188 @@ -1539,6 +1547,13 @@
4.1189 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)()>(ptr, mfp);
4.1190 }
4.1191
4.1192 +template <class X, class Y, class RetType>
4.1193 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)() const>
4.1194 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)()const)
4.1195 +{
4.1196 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)() const>(ptr, mfp);
4.1197 +}
4.1198 +
4.1199 // Support for 1 arguments
4.1200 template <class X, class Y, class RetType, class Param1>
4.1201 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1)>
4.1202 @@ -1547,6 +1562,13 @@
4.1203 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1)>(ptr, mfp);
4.1204 }
4.1205
4.1206 +template <class X, class Y, class RetType, class Param1>
4.1207 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1) const>
4.1208 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1)const)
4.1209 +{
4.1210 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1) const>(ptr, mfp);
4.1211 +}
4.1212 +
4.1213 // Support for 2 arguments
4.1214 template <class X, class Y, class RetType, class Param1, class Param2>
4.1215 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2)>
4.1216 @@ -1555,6 +1577,13 @@
4.1217 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2)>(ptr, mfp);
4.1218 }
4.1219
4.1220 +template <class X, class Y, class RetType, class Param1, class Param2>
4.1221 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2) const>
4.1222 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2)const)
4.1223 +{
4.1224 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2) const>(ptr, mfp);
4.1225 +}
4.1226 +
4.1227 // Support for 3 arguments
4.1228 template <class X, class Y, class RetType, class Param1, class Param2, class Param3>
4.1229 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3)>
4.1230 @@ -1563,6 +1592,13 @@
4.1231 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3)>(ptr, mfp);
4.1232 }
4.1233
4.1234 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3>
4.1235 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3) const>
4.1236 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3)const)
4.1237 +{
4.1238 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3) const>(ptr, mfp);
4.1239 +}
4.1240 +
4.1241 // Support for 4 arguments
4.1242 template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4>
4.1243 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4)>
4.1244 @@ -1571,6 +1607,13 @@
4.1245 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4)>(ptr, mfp);
4.1246 }
4.1247
4.1248 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4>
4.1249 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4) const>
4.1250 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4)const)
4.1251 +{
4.1252 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4) const>(ptr, mfp);
4.1253 +}
4.1254 +
4.1255 // Support for 5 arguments
4.1256 template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5>
4.1257 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5)>
4.1258 @@ -1579,6 +1622,13 @@
4.1259 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5)>(ptr, mfp);
4.1260 }
4.1261
4.1262 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5>
4.1263 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5) const>
4.1264 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5)const)
4.1265 +{
4.1266 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5) const>(ptr, mfp);
4.1267 +}
4.1268 +
4.1269 // Support for 6 arguments
4.1270 template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6>
4.1271 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6)>
4.1272 @@ -1587,6 +1637,13 @@
4.1273 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6)>(ptr, mfp);
4.1274 }
4.1275
4.1276 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6>
4.1277 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6) const>
4.1278 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6)const)
4.1279 +{
4.1280 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6) const>(ptr, mfp);
4.1281 +}
4.1282 +
4.1283 // Support for 7 arguments
4.1284 template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7>
4.1285 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)>
4.1286 @@ -1595,6 +1652,13 @@
4.1287 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)>(ptr, mfp);
4.1288 }
4.1289
4.1290 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7>
4.1291 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7) const>
4.1292 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7)const)
4.1293 +{
4.1294 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7) const>(ptr, mfp);
4.1295 +}
4.1296 +
4.1297 // Support for 8 arguments
4.1298 template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8>
4.1299 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)>
4.1300 @@ -1603,6 +1667,13 @@
4.1301 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)>(ptr, mfp);
4.1302 }
4.1303
4.1304 +template <class X, class Y, class RetType, class Param1, class Param2, class Param3, class Param4, class Param5, class Param6, class Param7, class Param8>
4.1305 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8) const>
4.1306 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8)const)
4.1307 +{
4.1308 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8) const>(ptr, mfp);
4.1309 +}
4.1310 +
4.1311 // Support for 9 arguments
4.1312 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>
4.1313 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)>
4.1314 @@ -1611,6 +1682,13 @@
4.1315 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)>(ptr, mfp);
4.1316 }
4.1317
4.1318 +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>
4.1319 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9) const>
4.1320 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9)const)
4.1321 +{
4.1322 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9) const>(ptr, mfp);
4.1323 +}
4.1324 +
4.1325 // Support for 10 arguments
4.1326 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>
4.1327 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)>
4.1328 @@ -1619,6 +1697,13 @@
4.1329 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)>(ptr, mfp);
4.1330 }
4.1331
4.1332 +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>
4.1333 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10) const>
4.1334 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10)const)
4.1335 +{
4.1336 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10) const>(ptr, mfp);
4.1337 +}
4.1338 +
4.1339 // Support for 11 arguments
4.1340 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>
4.1341 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)>
4.1342 @@ -1627,6 +1712,13 @@
4.1343 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)>(ptr, mfp);
4.1344 }
4.1345
4.1346 +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>
4.1347 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11) const>
4.1348 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11)const)
4.1349 +{
4.1350 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11) const>(ptr, mfp);
4.1351 +}
4.1352 +
4.1353 // Support for 12 arguments
4.1354 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>
4.1355 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)>
4.1356 @@ -1635,6 +1727,13 @@
4.1357 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)>(ptr, mfp);
4.1358 }
4.1359
4.1360 +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>
4.1361 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12) const>
4.1362 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12)const)
4.1363 +{
4.1364 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12) const>(ptr, mfp);
4.1365 +}
4.1366 +
4.1367 // Support for 13 arguments
4.1368 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>
4.1369 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)>
4.1370 @@ -1643,6 +1742,13 @@
4.1371 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)>(ptr, mfp);
4.1372 }
4.1373
4.1374 +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>
4.1375 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13) const>
4.1376 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13)const)
4.1377 +{
4.1378 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13) const>(ptr, mfp);
4.1379 +}
4.1380 +
4.1381 // Support for 14 arguments
4.1382 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>
4.1383 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)>
4.1384 @@ -1651,6 +1757,13 @@
4.1385 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)>(ptr, mfp);
4.1386 }
4.1387
4.1388 +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>
4.1389 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14) const>
4.1390 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14)const)
4.1391 +{
4.1392 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14) const>(ptr, mfp);
4.1393 +}
4.1394 +
4.1395 // Support for 15 arguments
4.1396 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>
4.1397 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)>
4.1398 @@ -1659,6 +1772,13 @@
4.1399 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)>(ptr, mfp);
4.1400 }
4.1401
4.1402 +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>
4.1403 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15) const>
4.1404 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15)const)
4.1405 +{
4.1406 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15) const>(ptr, mfp);
4.1407 +}
4.1408 +
4.1409 // Support for 16 arguments
4.1410 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>
4.1411 SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)>
4.1412 @@ -1667,6 +1787,13 @@
4.1413 return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)>(ptr, mfp);
4.1414 }
4.1415
4.1416 +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>
4.1417 +SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16) const>
4.1418 +SH_CALL(SourceHook::CallClass<Y> *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16)const)
4.1419 +{
4.1420 + return SourceHook::ExecutableClass<SourceHook::CallClass<Y>, RetType, RetType (X::*)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16) const>(ptr, mfp);
4.1421 +}
4.1422 +
4.1423
4.1424 #undef SH_MAKE_EXECUTABLECLASS_BODY
4.1425
5.1 --- a/sourcehook/test/main.cpp Sat Apr 30 18:45:41 2005 +0000
5.2 +++ b/sourcehook/test/main.cpp Sat Apr 30 19:09:51 2005 +0000
5.3 @@ -45,10 +45,9 @@
5.4 ++passed;
5.5 else
5.6 ++failed;
5.7 -
5.8 - cout << endl << "----" << endl << "Passed: " << passed << endl << "Failed: " << failed << endl;
5.9 - cout << "Total: " << passed + failed << endl;
5.10 }
5.11 + cout << endl << "----" << endl << "Passed: " << passed << endl << "Failed: " << failed << endl;
5.12 + cout << "Total: " << passed + failed << endl;
5.13 }
5.14 };
5.15
5.16 @@ -59,6 +58,7 @@
5.17 Test g_Test##x(Test##x, #x);
5.18
5.19 DO_TEST(Basic);
5.20 +DO_TEST(VafmtAndOverload);
5.21
5.22 int main(int argc, char *argv[])
5.23 {
6.1 --- a/sourcehook/test/test1.cpp Sat Apr 30 18:45:41 2005 +0000
6.2 +++ b/sourcehook/test/test1.cpp Sat Apr 30 19:09:51 2005 +0000
6.3 @@ -2,446 +2,458 @@
6.4 #include "sourcehook_impl.h"
6.5 #include "testevents.h"
6.6
6.7 -// Global to all tests
6.8 -SourceHook::ISourceHook *g_SHPtr;
6.9 -SourceHook::Plugin g_PLID;
6.10 -
6.11 -// TEST1
6.12 -// Basic tests
6.13 -// Hooking and callclass
6.14 -
6.15 -
6.16 -struct State_F1_Called : State
6.17 -{
6.18 -};
6.19 -
6.20 -struct State_F1_PreHandler_Called : State
6.21 -{
6.22 -};
6.23 -
6.24 -struct State_F1_PostHandler_Called : State
6.25 +namespace
6.26 {
6.27 -};
6.28 + StateList g_States;
6.29 + SourceHook::ISourceHook *g_SHPtr;
6.30 + SourceHook::Plugin g_PLID;
6.31 +
6.32 + // TEST1
6.33 + // Basic tests
6.34 + // Hooking and callclass
6.35 +
6.36 + struct State_F1_Called : State
6.37 + {
6.38 + };
6.39 +
6.40 + struct State_F1_PreHandler_Called : State
6.41 + {
6.42 + };
6.43 +
6.44 + struct State_F1_PostHandler_Called : State
6.45 + {
6.46 + };
6.47
6.48 -struct State_F1_HookAdded : State
6.49 -{
6.50 - bool m_Successfully;
6.51 - State_F1_HookAdded(bool successfully) : m_Successfully(successfully)
6.52 + struct State_F1_HookAdded : State
6.53 {
6.54 - }
6.55 + bool m_Successfully;
6.56 + State_F1_HookAdded(bool successfully) : m_Successfully(successfully)
6.57 + {
6.58 + }
6.59
6.60 - bool IsEqual(State *other)
6.61 + bool IsEqual(State *other)
6.62 + {
6.63 + State_F1_HookAdded *other2 = dynamic_cast<State_F1_HookAdded*>(other);
6.64 + if (!other2)
6.65 + return false;
6.66 + return other2->m_Successfully == m_Successfully;
6.67 + }
6.68 + };
6.69 +
6.70 + struct State_F1_HookRemoved : State
6.71 + {
6.72 + };
6.73 +
6.74 + struct State_F1_CallClassGenerated : State
6.75 + {
6.76 + };
6.77 +
6.78 + struct State_F1_CallClassReleased : State
6.79 {
6.80 - State_F1_HookAdded *other2 = dynamic_cast<State_F1_HookAdded*>(other);
6.81 - if (!other2)
6.82 - return false;
6.83 - return other2->m_Successfully == m_Successfully;
6.84 - }
6.85 -};
6.86 + };
6.87 +
6.88 + struct State_F299_Called : State
6.89 + {
6.90 + std::string param;
6.91 + State_F299_Called(const char *p) : param(p)
6.92 + {
6.93 + }
6.94 + bool IsEqual(State *other)
6.95 + {
6.96 + State_F299_Called *other2 = dynamic_cast<State_F299_Called*>(other);
6.97 + if (!other2)
6.98 + return false;
6.99 + return other2->param == param;
6.100 + }
6.101 + };
6.102
6.103 -struct State_F1_HookRemoved : State
6.104 -{
6.105 -};
6.106 + struct State_F299_PreHandlerCalled : State_F299_Called
6.107 + {
6.108 + State_F299_PreHandlerCalled(const char *p) : State_F299_Called(p)
6.109 + {
6.110 + }
6.111 + };
6.112 +
6.113 + struct State_F299_PostHandlerCalled : State_F299_Called
6.114 + {
6.115 + State_F299_PostHandlerCalled(const char *p) : State_F299_Called(p)
6.116 + {
6.117 + }
6.118 + };
6.119 +
6.120 + struct State_F299Ret : State
6.121 + {
6.122 + bool m_Ret;
6.123 + State_F299Ret(bool ret) : m_Ret(ret)
6.124 + {
6.125 + }
6.126 +
6.127 + bool IsEqual(State *other)
6.128 + {
6.129 + State_F299Ret *other2 = dynamic_cast<State_F299Ret*>(other);
6.130 + if (!other2)
6.131 + return false;
6.132 + return other2->m_Ret == m_Ret;
6.133 + }
6.134 + };
6.135
6.136 -struct State_F1_CallClassGenerated : State
6.137 -{
6.138 -};
6.139 -
6.140 -struct State_F1_CallClassReleased : State
6.141 -{
6.142 -};
6.143 -
6.144 -struct State_F299_Called : State
6.145 -{
6.146 - std::string param;
6.147 - State_F299_Called(const char *p) : param(p)
6.148 - {
6.149 - }
6.150 - bool IsEqual(State *other)
6.151 + class Test
6.152 {
6.153 - State_F299_Called *other2 = dynamic_cast<State_F299_Called*>(other);
6.154 - if (!other2)
6.155 - return false;
6.156 - return other2->param == param;
6.157 - }
6.158 -};
6.159 + public:
6.160 + virtual void F1()
6.161 + {
6.162 + ADD_STATE(State_F1_Called);
6.163 + }
6.164 + virtual void F2(){}
6.165 + virtual void F3(){}
6.166 + virtual void F4(){}
6.167 + virtual void F5(){}
6.168 + virtual void F6(){}
6.169 + virtual void F7(){}
6.170 + virtual void F8(){}
6.171 + virtual void F9(){}
6.172 + virtual void F10(){}
6.173 + virtual void F11(){}
6.174 + virtual void F12(){}
6.175 + virtual void F13(){}
6.176 + virtual void F14(){}
6.177 + virtual void F15(){}
6.178 + virtual void F16(){}
6.179 + virtual void F17(){}
6.180 + virtual void F18(){}
6.181 + virtual void F19(){}
6.182 + virtual void F20(){}
6.183 + virtual void F21(){}
6.184 + virtual void F22(){}
6.185 + virtual void F23(){}
6.186 + virtual void F24(){}
6.187 + virtual void F25(){}
6.188 + virtual void F26(){}
6.189 + virtual void F27(){}
6.190 + virtual void F28(){}
6.191 + virtual void F29(){}
6.192 + virtual void F30(){}
6.193 + virtual void F31(){}
6.194 + virtual void F32(){}
6.195 + virtual void F33(){}
6.196 + virtual void F34(){}
6.197 + virtual void F35(){}
6.198 + virtual void F36(){}
6.199 + virtual void F37(){}
6.200 + virtual void F38(){}
6.201 + virtual void F39(){}
6.202 + virtual void F40(){}
6.203 + virtual void F41(){}
6.204 + virtual void F42(){}
6.205 + virtual void F43(){}
6.206 + virtual void F44(){}
6.207 + virtual void F45(){}
6.208 + virtual void F46(){}
6.209 + virtual void F47(){}
6.210 + virtual void F48(){}
6.211 + virtual void F49(){}
6.212 + virtual void F50(){}
6.213 + virtual void F51(){}
6.214 + virtual void F52(){}
6.215 + virtual void F53(){}
6.216 + virtual void F54(){}
6.217 + virtual void F55(){}
6.218 + virtual void F56(){}
6.219 + virtual void F57(){}
6.220 + virtual void F58(){}
6.221 + virtual void F59(){}
6.222 + virtual void F60(){}
6.223 + virtual void F61(){}
6.224 + virtual void F62(){}
6.225 + virtual void F63(){}
6.226 + virtual void F64(){}
6.227 + virtual void F65(){}
6.228 + virtual void F66(){}
6.229 + virtual void F67(){}
6.230 + virtual void F68(){}
6.231 + virtual void F69(){}
6.232 + virtual void F70(){}
6.233 + virtual void F71(){}
6.234 + virtual void F72(){}
6.235 + virtual void F73(){}
6.236 + virtual void F74(){}
6.237 + virtual void F75(){}
6.238 + virtual void F76(){}
6.239 + virtual void F77(){}
6.240 + virtual void F78(){}
6.241 + virtual void F79(){}
6.242 + virtual void F80(){}
6.243 + virtual void F81(){}
6.244 + virtual void F82(){}
6.245 + virtual void F83(){}
6.246 + virtual void F84(){}
6.247 + virtual void F85(){}
6.248 + virtual void F86(){}
6.249 + virtual void F87(){}
6.250 + virtual void F88(){}
6.251 + virtual void F89(){}
6.252 + virtual void F90(){}
6.253 + virtual void F91(){}
6.254 + virtual void F92(){}
6.255 + virtual void F93(){}
6.256 + virtual void F94(){}
6.257 + virtual void F95(){}
6.258 + virtual void F96(){}
6.259 + virtual void F97(){}
6.260 + virtual void F98(){}
6.261 + virtual void F99(){}
6.262 + virtual void F100(){}
6.263 + virtual void F101(){}
6.264 + virtual void F102(){}
6.265 + virtual void F103(){}
6.266 + virtual void F104(){}
6.267 + virtual void F105(){}
6.268 + virtual void F106(){}
6.269 + virtual void F107(){}
6.270 + virtual void F108(){}
6.271 + virtual void F109(){}
6.272 + virtual void F110(){}
6.273 + virtual void F111(){}
6.274 + virtual void F112(){}
6.275 + virtual void F113(){}
6.276 + virtual void F114(){}
6.277 + virtual void F115(){}
6.278 + virtual void F116(){}
6.279 + virtual void F117(){}
6.280 + virtual void F118(){}
6.281 + virtual void F119(){}
6.282 + virtual void F120(){}
6.283 + virtual void F121(){}
6.284 + virtual void F122(){}
6.285 + virtual void F123(){}
6.286 + virtual void F124(){}
6.287 + virtual void F125(){}
6.288 + virtual void F126(){}
6.289 + virtual void F127(){}
6.290 + virtual void F128(){}
6.291 + virtual void F129(){}
6.292 + virtual void F130(){}
6.293 + virtual void F131(){}
6.294 + virtual void F132(){}
6.295 + virtual void F133(){}
6.296 + virtual void F134(){}
6.297 + virtual void F135(){}
6.298 + virtual void F136(){}
6.299 + virtual void F137(){}
6.300 + virtual void F138(){}
6.301 + virtual void F139(){}
6.302 + virtual void F140(){}
6.303 + virtual void F141(){}
6.304 + virtual void F142(){}
6.305 + virtual void F143(){}
6.306 + virtual void F144(){}
6.307 + virtual void F145(){}
6.308 + virtual void F146(){}
6.309 + virtual void F147(){}
6.310 + virtual void F148(){}
6.311 + virtual void F149(){}
6.312 + virtual void F150(){}
6.313 + virtual void F151(){}
6.314 + virtual void F152(){}
6.315 + virtual void F153(){}
6.316 + virtual void F154(){}
6.317 + virtual void F155(){}
6.318 + virtual void F156(){}
6.319 + virtual void F157(){}
6.320 + virtual void F158(){}
6.321 + virtual void F159(){}
6.322 + virtual void F160(){}
6.323 + virtual void F161(){}
6.324 + virtual void F162(){}
6.325 + virtual void F163(){}
6.326 + virtual void F164(){}
6.327 + virtual void F165(){}
6.328 + virtual void F166(){}
6.329 + virtual void F167(){}
6.330 + virtual void F168(){}
6.331 + virtual void F169(){}
6.332 + virtual void F170(){}
6.333 + virtual void F171(){}
6.334 + virtual void F172(){}
6.335 + virtual void F173(){}
6.336 + virtual void F174(){}
6.337 + virtual void F175(){}
6.338 + virtual void F176(){}
6.339 + virtual void F177(){}
6.340 + virtual void F178(){}
6.341 + virtual void F179(){}
6.342 + virtual void F180(){}
6.343 + virtual void F181(){}
6.344 + virtual void F182(){}
6.345 + virtual void F183(){}
6.346 + virtual void F184(){}
6.347 + virtual void F185(){}
6.348 + virtual void F186(){}
6.349 + virtual void F187(){}
6.350 + virtual void F188(){}
6.351 + virtual void F189(){}
6.352 + virtual void F190(){}
6.353 + virtual void F191(){}
6.354 + virtual void F192(){}
6.355 + virtual void F193(){}
6.356 + virtual void F194(){}
6.357 + virtual void F195(){}
6.358 + virtual void F196(){}
6.359 + virtual void F197(){}
6.360 + virtual void F198(){}
6.361 + virtual void F199(){}
6.362 + virtual void F200(){}
6.363 + virtual void F201(){}
6.364 + virtual void F202(){}
6.365 + virtual void F203(){}
6.366 + virtual void F204(){}
6.367 + virtual void F205(){}
6.368 + virtual void F206(){}
6.369 + virtual void F207(){}
6.370 + virtual void F208(){}
6.371 + virtual void F209(){}
6.372 + virtual void F210(){}
6.373 + virtual void F211(){}
6.374 + virtual void F212(){}
6.375 + virtual void F213(){}
6.376 + virtual void F214(){}
6.377 + virtual void F215(){}
6.378 + virtual void F216(){}
6.379 + virtual void F217(){}
6.380 + virtual void F218(){}
6.381 + virtual void F219(){}
6.382 + virtual void F220(){}
6.383 + virtual void F221(){}
6.384 + virtual void F222(){}
6.385 + virtual void F223(){}
6.386 + virtual void F224(){}
6.387 + virtual void F225(){}
6.388 + virtual void F226(){}
6.389 + virtual void F227(){}
6.390 + virtual void F228(){}
6.391 + virtual void F229(){}
6.392 + virtual void F230(){}
6.393 + virtual void F231(){}
6.394 + virtual void F232(){}
6.395 + virtual void F233(){}
6.396 + virtual void F234(){}
6.397 + virtual void F235(){}
6.398 + virtual void F236(){}
6.399 + virtual void F237(){}
6.400 + virtual void F238(){}
6.401 + virtual void F239(){}
6.402 + virtual void F240(){}
6.403 + virtual void F241(){}
6.404 + virtual void F242(){}
6.405 + virtual void F243(){}
6.406 + virtual void F244(){}
6.407 + virtual void F245(){}
6.408 + virtual void F246(){}
6.409 + virtual void F247(){}
6.410 + virtual void F248(){}
6.411 + virtual void F249(){}
6.412 + virtual void F250(){}
6.413 + virtual void F251(){}
6.414 + virtual void F252(){}
6.415 + virtual void F253(){}
6.416 + virtual void F254(){}
6.417 + virtual void F255(){}
6.418 + virtual void F256(){}
6.419 + virtual void F257(){}
6.420 + virtual void F258(){}
6.421 + virtual void F259(){}
6.422 + virtual void F260(){}
6.423 + virtual void F261(){}
6.424 + virtual void F262(){}
6.425 + virtual void F263(){}
6.426 + virtual void F264(){}
6.427 + virtual void F265(){}
6.428 + virtual void F266(){}
6.429 + virtual void F267(){}
6.430 + virtual void F268(){}
6.431 + virtual void F269(){}
6.432 + virtual void F270(){}
6.433 + virtual void F271(){}
6.434 + virtual void F272(){}
6.435 + virtual void F273(){}
6.436 + virtual void F274(){}
6.437 + virtual void F275(){}
6.438 + virtual void F276(){}
6.439 + virtual void F277(){}
6.440 + virtual void F278(){}
6.441 + virtual void F279(){}
6.442 + virtual void F280(){}
6.443 + virtual void F281(){}
6.444 + virtual void F282(){}
6.445 + virtual void F283(){}
6.446 + virtual void F284(){}
6.447 + virtual void F285(){}
6.448 + virtual void F286(){}
6.449 + virtual void F287(){}
6.450 + virtual void F288(){}
6.451 + virtual void F289(){}
6.452 + virtual void F290(){}
6.453 + virtual void F291(){}
6.454 + virtual void F292(){}
6.455 + virtual void F293(){}
6.456 + virtual void F294(){}
6.457 + virtual void F295(){}
6.458 + virtual void F296(){}
6.459 + virtual void F297(){}
6.460 + virtual void F298(){}
6.461 + virtual bool F299(const char *mwah)
6.462 + {
6.463 + ADD_STATE(State_F299_Called(mwah));
6.464 + return true;
6.465 + }
6.466 + };
6.467
6.468 -struct State_F299_PreHandlerCalled : State_F299_Called
6.469 -{
6.470 - State_F299_PreHandlerCalled(const char *p) : State_F299_Called(p)
6.471 + SH_DECL_HOOK1(Test, F299, SH_NOATTRIB, 0, bool, const char *);
6.472 + SH_DECL_HOOK0_void(Test, F1, SH_NOATTRIB, 0);
6.473 + SH_DECL_HOOK0_void(Test, F2, SH_NOATTRIB, 0);
6.474 + SH_DECL_HOOK0_void(Test, F3, SH_NOATTRIB, 0);
6.475 + SH_DECL_HOOK0_void(Test, F4, SH_NOATTRIB, 0);
6.476 + SH_DECL_HOOK0_void(Test, F5, SH_NOATTRIB, 0);
6.477 + SH_DECL_HOOK0_void(Test, F6, SH_NOATTRIB, 0);
6.478 + SH_DECL_HOOK0_void(Test, F7, SH_NOATTRIB, 0);
6.479 + SH_DECL_HOOK0_void(Test, F8, SH_NOATTRIB, 0);
6.480 + SH_DECL_HOOK0_void(Test, F9, SH_NOATTRIB, 0);
6.481 + SH_DECL_HOOK0_void(Test, F10, SH_NOATTRIB, 0);
6.482 +
6.483 + META_RES g_F1Pre_WhatToDo;
6.484 + META_RES g_F1Post_WhatToDo;
6.485 +
6.486 + struct HandlersF1
6.487 {
6.488 - }
6.489 -};
6.490 + void Pre()
6.491 + {
6.492 + ADD_STATE(State_F1_PreHandler_Called);
6.493 + RETURN_META(g_F1Pre_WhatToDo);
6.494 + }
6.495
6.496 -struct State_F299_PostHandlerCalled : State_F299_Called
6.497 -{
6.498 - State_F299_PostHandlerCalled(const char *p) : State_F299_Called(p)
6.499 + void Post()
6.500 + {
6.501 + ADD_STATE(State_F1_PostHandler_Called);
6.502 + RETURN_META(g_F1Post_WhatToDo);
6.503 + }
6.504 + };
6.505 +
6.506 + META_RES g_F299Pre_WhatToDo;
6.507 + bool g_F299Pre_WhatToRet;
6.508 +
6.509 + bool F299_Pre(const char *mwah)
6.510 {
6.511 - }
6.512 -};
6.513 -
6.514 -struct State_F299Ret : State
6.515 -{
6.516 - bool m_Ret;
6.517 - State_F299Ret(bool ret) : m_Ret(ret)
6.518 - {
6.519 + ADD_STATE(State_F299_PreHandlerCalled(mwah));
6.520 + RETURN_META_VALUE(g_F299Pre_WhatToDo, g_F299Pre_WhatToRet);
6.521 }
6.522
6.523 - bool IsEqual(State *other)
6.524 - {
6.525 - State_F299Ret *other2 = dynamic_cast<State_F299Ret*>(other);
6.526 - if (!other2)
6.527 - return false;
6.528 - return other2->m_Ret == m_Ret;
6.529 - }
6.530 -};
6.531 -
6.532 -class Test
6.533 -{
6.534 -public:
6.535 - virtual void F1()
6.536 + bool F299_Post(const char *mwah)
6.537 {
6.538 - ADD_STATE(State_F1_Called);
6.539 - }
6.540 - virtual void F2(){}
6.541 - virtual void F3(){}
6.542 - virtual void F4(){}
6.543 - virtual void F5(){}
6.544 - virtual void F6(){}
6.545 - virtual void F7(){}
6.546 - virtual void F8(){}
6.547 - virtual void F9(){}
6.548 - virtual void F10(){}
6.549 - virtual void F11(){}
6.550 - virtual void F12(){}
6.551 - virtual void F13(){}
6.552 - virtual void F14(){}
6.553 - virtual void F15(){}
6.554 - virtual void F16(){}
6.555 - virtual void F17(){}
6.556 - virtual void F18(){}
6.557 - virtual void F19(){}
6.558 - virtual void F20(){}
6.559 - virtual void F21(){}
6.560 - virtual void F22(){}
6.561 - virtual void F23(){}
6.562 - virtual void F24(){}
6.563 - virtual void F25(){}
6.564 - virtual void F26(){}
6.565 - virtual void F27(){}
6.566 - virtual void F28(){}
6.567 - virtual void F29(){}
6.568 - virtual void F30(){}
6.569 - virtual void F31(){}
6.570 - virtual void F32(){}
6.571 - virtual void F33(){}
6.572 - virtual void F34(){}
6.573 - virtual void F35(){}
6.574 - virtual void F36(){}
6.575 - virtual void F37(){}
6.576 - virtual void F38(){}
6.577 - virtual void F39(){}
6.578 - virtual void F40(){}
6.579 - virtual void F41(){}
6.580 - virtual void F42(){}
6.581 - virtual void F43(){}
6.582 - virtual void F44(){}
6.583 - virtual void F45(){}
6.584 - virtual void F46(){}
6.585 - virtual void F47(){}
6.586 - virtual void F48(){}
6.587 - virtual void F49(){}
6.588 - virtual void F50(){}
6.589 - virtual void F51(){}
6.590 - virtual void F52(){}
6.591 - virtual void F53(){}
6.592 - virtual void F54(){}
6.593 - virtual void F55(){}
6.594 - virtual void F56(){}
6.595 - virtual void F57(){}
6.596 - virtual void F58(){}
6.597 - virtual void F59(){}
6.598 - virtual void F60(){}
6.599 - virtual void F61(){}
6.600 - virtual void F62(){}
6.601 - virtual void F63(){}
6.602 - virtual void F64(){}
6.603 - virtual void F65(){}
6.604 - virtual void F66(){}
6.605 - virtual void F67(){}
6.606 - virtual void F68(){}
6.607 - virtual void F69(){}
6.608 - virtual void F70(){}
6.609 - virtual void F71(){}
6.610 - virtual void F72(){}
6.611 - virtual void F73(){}
6.612 - virtual void F74(){}
6.613 - virtual void F75(){}
6.614 - virtual void F76(){}
6.615 - virtual void F77(){}
6.616 - virtual void F78(){}
6.617 - virtual void F79(){}
6.618 - virtual void F80(){}
6.619 - virtual void F81(){}
6.620 - virtual void F82(){}
6.621 - virtual void F83(){}
6.622 - virtual void F84(){}
6.623 - virtual void F85(){}
6.624 - virtual void F86(){}
6.625 - virtual void F87(){}
6.626 - virtual void F88(){}
6.627 - virtual void F89(){}
6.628 - virtual void F90(){}
6.629 - virtual void F91(){}
6.630 - virtual void F92(){}
6.631 - virtual void F93(){}
6.632 - virtual void F94(){}
6.633 - virtual void F95(){}
6.634 - virtual void F96(){}
6.635 - virtual void F97(){}
6.636 - virtual void F98(){}
6.637 - virtual void F99(){}
6.638 - virtual void F100(){}
6.639 - virtual void F101(){}
6.640 - virtual void F102(){}
6.641 - virtual void F103(){}
6.642 - virtual void F104(){}
6.643 - virtual void F105(){}
6.644 - virtual void F106(){}
6.645 - virtual void F107(){}
6.646 - virtual void F108(){}
6.647 - virtual void F109(){}
6.648 - virtual void F110(){}
6.649 - virtual void F111(){}
6.650 - virtual void F112(){}
6.651 - virtual void F113(){}
6.652 - virtual void F114(){}
6.653 - virtual void F115(){}
6.654 - virtual void F116(){}
6.655 - virtual void F117(){}
6.656 - virtual void F118(){}
6.657 - virtual void F119(){}
6.658 - virtual void F120(){}
6.659 - virtual void F121(){}
6.660 - virtual void F122(){}
6.661 - virtual void F123(){}
6.662 - virtual void F124(){}
6.663 - virtual void F125(){}
6.664 - virtual void F126(){}
6.665 - virtual void F127(){}
6.666 - virtual void F128(){}
6.667 - virtual void F129(){}
6.668 - virtual void F130(){}
6.669 - virtual void F131(){}
6.670 - virtual void F132(){}
6.671 - virtual void F133(){}
6.672 - virtual void F134(){}
6.673 - virtual void F135(){}
6.674 - virtual void F136(){}
6.675 - virtual void F137(){}
6.676 - virtual void F138(){}
6.677 - virtual void F139(){}
6.678 - virtual void F140(){}
6.679 - virtual void F141(){}
6.680 - virtual void F142(){}
6.681 - virtual void F143(){}
6.682 - virtual void F144(){}
6.683 - virtual void F145(){}
6.684 - virtual void F146(){}
6.685 - virtual void F147(){}
6.686 - virtual void F148(){}
6.687 - virtual void F149(){}
6.688 - virtual void F150(){}
6.689 - virtual void F151(){}
6.690 - virtual void F152(){}
6.691 - virtual void F153(){}
6.692 - virtual void F154(){}
6.693 - virtual void F155(){}
6.694 - virtual void F156(){}
6.695 - virtual void F157(){}
6.696 - virtual void F158(){}
6.697 - virtual void F159(){}
6.698 - virtual void F160(){}
6.699 - virtual void F161(){}
6.700 - virtual void F162(){}
6.701 - virtual void F163(){}
6.702 - virtual void F164(){}
6.703 - virtual void F165(){}
6.704 - virtual void F166(){}
6.705 - virtual void F167(){}
6.706 - virtual void F168(){}
6.707 - virtual void F169(){}
6.708 - virtual void F170(){}
6.709 - virtual void F171(){}
6.710 - virtual void F172(){}
6.711 - virtual void F173(){}
6.712 - virtual void F174(){}
6.713 - virtual void F175(){}
6.714 - virtual void F176(){}
6.715 - virtual void F177(){}
6.716 - virtual void F178(){}
6.717 - virtual void F179(){}
6.718 - virtual void F180(){}
6.719 - virtual void F181(){}
6.720 - virtual void F182(){}
6.721 - virtual void F183(){}
6.722 - virtual void F184(){}
6.723 - virtual void F185(){}
6.724 - virtual void F186(){}
6.725 - virtual void F187(){}
6.726 - virtual void F188(){}
6.727 - virtual void F189(){}
6.728 - virtual void F190(){}
6.729 - virtual void F191(){}
6.730 - virtual void F192(){}
6.731 - virtual void F193(){}
6.732 - virtual void F194(){}
6.733 - virtual void F195(){}
6.734 - virtual void F196(){}
6.735 - virtual void F197(){}
6.736 - virtual void F198(){}
6.737 - virtual void F199(){}
6.738 - virtual void F200(){}
6.739 - virtual void F201(){}
6.740 - virtual void F202(){}
6.741 - virtual void F203(){}
6.742 - virtual void F204(){}
6.743 - virtual void F205(){}
6.744 - virtual void F206(){}
6.745 - virtual void F207(){}
6.746 - virtual void F208(){}
6.747 - virtual void F209(){}
6.748 - virtual void F210(){}
6.749 - virtual void F211(){}
6.750 - virtual void F212(){}
6.751 - virtual void F213(){}
6.752 - virtual void F214(){}
6.753 - virtual void F215(){}
6.754 - virtual void F216(){}
6.755 - virtual void F217(){}
6.756 - virtual void F218(){}
6.757 - virtual void F219(){}
6.758 - virtual void F220(){}
6.759 - virtual void F221(){}
6.760 - virtual void F222(){}
6.761 - virtual void F223(){}
6.762 - virtual void F224(){}
6.763 - virtual void F225(){}
6.764 - virtual void F226(){}
6.765 - virtual void F227(){}
6.766 - virtual void F228(){}
6.767 - virtual void F229(){}
6.768 - virtual void F230(){}
6.769 - virtual void F231(){}
6.770 - virtual void F232(){}
6.771 - virtual void F233(){}
6.772 - virtual void F234(){}
6.773 - virtual void F235(){}
6.774 - virtual void F236(){}
6.775 - virtual void F237(){}
6.776 - virtual void F238(){}
6.777 - virtual void F239(){}
6.778 - virtual void F240(){}
6.779 - virtual void F241(){}
6.780 - virtual void F242(){}
6.781 - virtual void F243(){}
6.782 - virtual void F244(){}
6.783 - virtual void F245(){}
6.784 - virtual void F246(){}
6.785 - virtual void F247(){}
6.786 - virtual void F248(){}
6.787 - virtual void F249(){}
6.788 - virtual void F250(){}
6.789 - virtual void F251(){}
6.790 - virtual void F252(){}
6.791 - virtual void F253(){}
6.792 - virtual void F254(){}
6.793 - virtual void F255(){}
6.794 - virtual void F256(){}
6.795 - virtual void F257(){}
6.796 - virtual void F258(){}
6.797 - virtual void F259(){}
6.798 - virtual void F260(){}
6.799 - virtual void F261(){}
6.800 - virtual void F262(){}
6.801 - virtual void F263(){}
6.802 - virtual void F264(){}
6.803 - virtual void F265(){}
6.804 - virtual void F266(){}
6.805 - virtual void F267(){}
6.806 - virtual void F268(){}
6.807 - virtual void F269(){}
6.808 - virtual void F270(){}
6.809 - virtual void F271(){}
6.810 - virtual void F272(){}
6.811 - virtual void F273(){}
6.812 - virtual void F274(){}
6.813 - virtual void F275(){}
6.814 - virtual void F276(){}
6.815 - virtual void F277(){}
6.816 - virtual void F278(){}
6.817 - virtual void F279(){}
6.818 - virtual void F280(){}
6.819 - virtual void F281(){}
6.820 - virtual void F282(){}
6.821 - virtual void F283(){}
6.822 - virtual void F284(){}
6.823 - virtual void F285(){}
6.824 - virtual void F286(){}
6.825 - virtual void F287(){}
6.826 - virtual void F288(){}
6.827 - virtual void F289(){}
6.828 - virtual void F290(){}
6.829 - virtual void F291(){}
6.830 - virtual void F292(){}
6.831 - virtual void F293(){}
6.832 - virtual void F294(){}
6.833 - virtual void F295(){}
6.834 - virtual void F296(){}
6.835 - virtual void F297(){}
6.836 - virtual void F298(){}
6.837 - virtual bool F299(const char *mwah)
6.838 - {
6.839 - ADD_STATE(State_F299_Called(mwah));
6.840 - return true;
6.841 - }
6.842 -};
6.843 -
6.844 -SH_DECL_HOOK0_void(Test, F1, SH_NOATTRIB, 0);
6.845 -SH_DECL_HOOK1(Test, F299, SH_NOATTRIB, 0, bool, const char *);
6.846 -
6.847 -META_RES g_F1Pre_WhatToDo;
6.848 -META_RES g_F1Post_WhatToDo;
6.849 -
6.850 -struct HandlersF1
6.851 -{
6.852 - void Pre()
6.853 - {
6.854 - ADD_STATE(State_F1_PreHandler_Called);
6.855 - RETURN_META(g_F1Pre_WhatToDo);
6.856 + ADD_STATE(State_F299_PostHandlerCalled(mwah));
6.857 + RETURN_META_VALUE(MRES_OVERRIDE, META_RESULT_STATUS >= MRES_OVERRIDE ? !META_RESULT_OVERRIDE_RET(bool) :
6.858 + !META_RESULT_ORIG_RET(bool));
6.859 }
6.860
6.861 - void Post()
6.862 - {
6.863 - ADD_STATE(State_F1_PostHandler_Called);
6.864 - RETURN_META(g_F1Post_WhatToDo);
6.865 - }
6.866 -};
6.867 -
6.868 -META_RES g_F299Pre_WhatToDo;
6.869 -bool g_F299Pre_WhatToRet;
6.870 -
6.871 -bool F299_Pre(const char *mwah)
6.872 -{
6.873 - ADD_STATE(State_F299_PreHandlerCalled(mwah));
6.874 - RETURN_META_VALUE(g_F299Pre_WhatToDo, g_F299Pre_WhatToRet);
6.875 -}
6.876 -
6.877 -bool F299_Post(const char *mwah)
6.878 -{
6.879 - ADD_STATE(State_F299_PostHandlerCalled(mwah));
6.880 - RETURN_META_VALUE(MRES_OVERRIDE, META_RESULT_STATUS >= MRES_OVERRIDE ? !META_RESULT_OVERRIDE_RET(bool) :
6.881 - !META_RESULT_ORIG_RET(bool));
6.882 }
6.883
6.884 bool TestBasic(std::string &error)
6.885 @@ -698,5 +710,27 @@
6.886 new State_F1_CallClassReleased,
6.887 NULL), "Part 11");
6.888
6.889 + // 12) Test? Test.
6.890 + SH_ADD_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, true);
6.891 + SH_ADD_HOOK_MEMFUNC(Test, F2, pTest, &f1_handlers, &HandlersF1::Pre, true);
6.892 + SH_ADD_HOOK_MEMFUNC(Test, F3, pTest, &f1_handlers, &HandlersF1::Pre, false);
6.893 + SH_ADD_HOOK_MEMFUNC(Test, F4, pTest, &f1_handlers, &HandlersF1::Pre, true);
6.894 + SH_ADD_HOOK_MEMFUNC(Test, F5, pTest, &f1_handlers, &HandlersF1::Pre, false);
6.895 + SH_ADD_HOOK_MEMFUNC(Test, F6, pTest, &f1_handlers, &HandlersF1::Pre, true);
6.896 + SH_ADD_HOOK_MEMFUNC(Test, F7, pTest, &f1_handlers, &HandlersF1::Pre, false);
6.897 + SH_ADD_HOOK_MEMFUNC(Test, F8, pTest, &f1_handlers, &HandlersF1::Pre, false);
6.898 + SH_ADD_HOOK_MEMFUNC(Test, F9, pTest, &f1_handlers, &HandlersF1::Pre, false);
6.899 + SH_ADD_HOOK_MEMFUNC(Test, F10, pTest, &f1_handlers, &HandlersF1::Pre, false);
6.900 +
6.901 + SH_REMOVE_HOOK_MEMFUNC(Test, F1, pTest, &f1_handlers, &HandlersF1::Pre, true);
6.902 + SH_REMOVE_HOOK_MEMFUNC(Test, F2, pTest, &f1_handlers, &HandlersF1::Pre, true);
6.903 + SH_REMOVE_HOOK_MEMFUNC(Test, F3, pTest, &f1_handlers, &HandlersF1::Pre, false);
6.904 + SH_REMOVE_HOOK_MEMFUNC(Test, F4, pTest, &f1_handlers, &HandlersF1::Pre, true);
6.905 + SH_REMOVE_HOOK_MEMFUNC(Test, F5, pTest, &f1_handlers, &HandlersF1::Pre, false);
6.906 + SH_REMOVE_HOOK_MEMFUNC(Test, F6, pTest, &f1_handlers, &HandlersF1::Pre, true);
6.907 + SH_REMOVE_HOOK_MEMFUNC(Test, F7, pTest, &f1_handlers, &HandlersF1::Pre, false);
6.908 + SH_REMOVE_HOOK_MEMFUNC(Test, F8, pTest, &f1_handlers, &HandlersF1::Pre, false);
6.909 + SH_REMOVE_HOOK_MEMFUNC(Test, F9, pTest, &f1_handlers, &HandlersF1::Pre, false);
6.910 + SH_REMOVE_HOOK_MEMFUNC(Test, F10, pTest, &f1_handlers, &HandlersF1::Pre, false);
6.911 return true;
6.912 }
6.913 \ No newline at end of file
7.1 --- a/sourcehook/test/testevents.h Sat Apr 30 18:45:41 2005 +0000
7.2 +++ b/sourcehook/test/testevents.h Sat Apr 30 19:09:51 2005 +0000
7.3 @@ -1,67 +1,70 @@
7.4 #ifndef __TESTEVENTS_H__
7.5 #define __TESTEVENTS_H__
7.6
7.7 -struct State
7.8 +namespace
7.9 {
7.10 - virtual ~State()
7.11 - {
7.12
7.13 - }
7.14 -
7.15 - virtual bool IsEqual(State *other)
7.16 + struct State
7.17 {
7.18 - return (typeid(other) == typeid(this)) ? true : false;
7.19 - }
7.20 -};
7.21 + virtual ~State()
7.22 + {
7.23 +
7.24 + }
7.25
7.26 -typedef std::list<State*> StateList;
7.27 -StateList g_States;
7.28 + virtual bool IsEqual(State *other)
7.29 + {
7.30 + return (typeid(other) == typeid(this)) ? true : false;
7.31 + }
7.32 + };
7.33
7.34 -#define ADD_STATE(name) g_States.push_back(new name)
7.35 + typedef std::list<State*> StateList;
7.36 +
7.37 + #define ADD_STATE(name) g_States.push_back(new name)
7.38
7.39
7.40 -bool StatesOk(StateList *sl, ...)
7.41 -{
7.42 - StateList requiredstates;
7.43 - va_list argptr;
7.44 - va_start(argptr, sl);
7.45 - while (true)
7.46 + bool StatesOk(StateList *sl, ...)
7.47 {
7.48 - State *cs = va_arg(argptr, State*);
7.49 - if (!cs)
7.50 - break;
7.51 - requiredstates.push_back(cs);
7.52 - }
7.53 - va_end(argptr);
7.54 + StateList requiredstates;
7.55 + va_list argptr;
7.56 + va_start(argptr, sl);
7.57 + while (true)
7.58 + {
7.59 + State *cs = va_arg(argptr, State*);
7.60 + if (!cs)
7.61 + break;
7.62 + requiredstates.push_back(cs);
7.63 + }
7.64 + va_end(argptr);
7.65
7.66 - if (requiredstates.size() != sl->size())
7.67 - {
7.68 + if (requiredstates.size() != sl->size())
7.69 + {
7.70 + for (StateList::iterator iter = requiredstates.begin(); iter != requiredstates.end(); ++iter)
7.71 + delete *iter;
7.72 + for (StateList::iterator iter = sl->begin(); iter != sl->end(); ++iter)
7.73 + delete *iter;
7.74 + sl->clear();
7.75 + return false;
7.76 + }
7.77 +
7.78 + bool ok = true;
7.79 + StateList::iterator req_iter = requiredstates.begin();
7.80 + for (StateList::iterator o_iter = sl->begin(); o_iter != sl->end(); ++o_iter, ++req_iter)
7.81 + {
7.82 + if (!(*o_iter)->IsEqual(*req_iter))
7.83 + {
7.84 + ok = false;
7.85 + break;
7.86 + }
7.87 + }
7.88 +
7.89 for (StateList::iterator iter = requiredstates.begin(); iter != requiredstates.end(); ++iter)
7.90 delete *iter;
7.91 for (StateList::iterator iter = sl->begin(); iter != sl->end(); ++iter)
7.92 delete *iter;
7.93 sl->clear();
7.94 - return false;
7.95 +
7.96 + return ok;
7.97 }
7.98 -
7.99 - bool ok = true;
7.100 - StateList::iterator req_iter = requiredstates.begin();
7.101 - for (StateList::iterator o_iter = sl->begin(); o_iter != sl->end(); ++o_iter, ++req_iter)
7.102 - {
7.103 - if (!(*o_iter)->IsEqual(*req_iter))
7.104 - {
7.105 - ok = false;
7.106 - break;
7.107 - }
7.108 - }
7.109 -
7.110 - for (StateList::iterator iter = requiredstates.begin(); iter != requiredstates.end(); ++iter)
7.111 - delete *iter;
7.112 - for (StateList::iterator iter = sl->begin(); iter != sl->end(); ++iter)
7.113 - delete *iter;
7.114 - sl->clear();
7.115 -
7.116 - return ok;
7.117 }
7.118
7.119 #define CHECK_STATES(mwah, myerr) if (!StatesOk mwah) { error=myerr; return false; }