Removed misuse of <:: (gcc compat)
authorPavol Marko <pavolmarko@gmail.com>
Sun Nov 04 13:19:08 2007 +0000 (2007-11-04)
changeset 44429202588687b
parent 443 8889b02fd07e
child 453 223f67807196
Removed misuse of <:: (gcc compat)
sourcehook/generate/sourcehook.h
sourcehook/generate/sourcehook.hxx
sourcehook/sourcehook.h
     1.1 --- a/sourcehook/generate/sourcehook.h	Sun Nov 04 13:14:35 2007 +0000
     1.2 +++ b/sourcehook/generate/sourcehook.h	Sun Nov 04 13:19:08 2007 +0000
     1.3 @@ -1115,7 +1115,7 @@
     1.4  		virtual rettype Func() \
     1.5  		{ SH_HANDLEFUNC((), (), rettype); } \
     1.6  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(); \
     1.7 -		typedef SourceHook::ExecutableClass0<::SourceHook::EmptyClass, ECMFP, rettype> CallEC; \
     1.8 +		typedef SourceHook::ExecutableClass0< ::SourceHook::EmptyClass, ECMFP, rettype > CallEC; \
     1.9  		typedef rettype RetType; \
    1.10  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.11  	\
    1.12 @@ -1269,7 +1269,7 @@
    1.13  		virtual rettype Func(param1 p1) \
    1.14  		{ SH_HANDLEFUNC((param1), (p1), rettype); } \
    1.15  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1); \
    1.16 -		typedef SourceHook::ExecutableClass1<::SourceHook::EmptyClass, ECMFP, rettype, param1> CallEC; \
    1.17 +		typedef SourceHook::ExecutableClass1< ::SourceHook::EmptyClass, ECMFP, rettype, param1 > CallEC; \
    1.18  		typedef rettype RetType; \
    1.19  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.20  	\
    1.21 @@ -1423,7 +1423,7 @@
    1.22  		virtual rettype Func(param1 p1, param2 p2) \
    1.23  		{ SH_HANDLEFUNC((param1, param2), (p1, p2), rettype); } \
    1.24  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2); \
    1.25 -		typedef SourceHook::ExecutableClass2<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2> CallEC; \
    1.26 +		typedef SourceHook::ExecutableClass2< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2 > CallEC; \
    1.27  		typedef rettype RetType; \
    1.28  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.29  	\
    1.30 @@ -1577,7 +1577,7 @@
    1.31  		virtual rettype Func(param1 p1, param2 p2, param3 p3) \
    1.32  		{ SH_HANDLEFUNC((param1, param2, param3), (p1, p2, p3), rettype); } \
    1.33  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3); \
    1.34 -		typedef SourceHook::ExecutableClass3<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3> CallEC; \
    1.35 +		typedef SourceHook::ExecutableClass3< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3 > CallEC; \
    1.36  		typedef rettype RetType; \
    1.37  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.38  	\
    1.39 @@ -1731,7 +1731,7 @@
    1.40  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4) \
    1.41  		{ SH_HANDLEFUNC((param1, param2, param3, param4), (p1, p2, p3, p4), rettype); } \
    1.42  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4); \
    1.43 -		typedef SourceHook::ExecutableClass4<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4> CallEC; \
    1.44 +		typedef SourceHook::ExecutableClass4< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4 > CallEC; \
    1.45  		typedef rettype RetType; \
    1.46  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.47  	\
    1.48 @@ -1885,7 +1885,7 @@
    1.49  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) \
    1.50  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5), rettype); } \
    1.51  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5); \
    1.52 -		typedef SourceHook::ExecutableClass5<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5> CallEC; \
    1.53 +		typedef SourceHook::ExecutableClass5< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5 > CallEC; \
    1.54  		typedef rettype RetType; \
    1.55  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.56  	\
    1.57 @@ -2039,7 +2039,7 @@
    1.58  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) \
    1.59  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6), rettype); } \
    1.60  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6); \
    1.61 -		typedef SourceHook::ExecutableClass6<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6> CallEC; \
    1.62 +		typedef SourceHook::ExecutableClass6< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6 > CallEC; \
    1.63  		typedef rettype RetType; \
    1.64  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.65  	\
    1.66 @@ -2193,7 +2193,7 @@
    1.67  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) \
    1.68  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7), rettype); } \
    1.69  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7); \
    1.70 -		typedef SourceHook::ExecutableClass7<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7> CallEC; \
    1.71 +		typedef SourceHook::ExecutableClass7< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7 > CallEC; \
    1.72  		typedef rettype RetType; \
    1.73  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.74  	\
    1.75 @@ -2347,7 +2347,7 @@
    1.76  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) \
    1.77  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8), rettype); } \
    1.78  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8); \
    1.79 -		typedef SourceHook::ExecutableClass8<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8> CallEC; \
    1.80 +		typedef SourceHook::ExecutableClass8< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8 > CallEC; \
    1.81  		typedef rettype RetType; \
    1.82  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.83  	\
    1.84 @@ -2501,7 +2501,7 @@
    1.85  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) \
    1.86  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9), rettype); } \
    1.87  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9); \
    1.88 -		typedef SourceHook::ExecutableClass9<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9> CallEC; \
    1.89 +		typedef SourceHook::ExecutableClass9< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9 > CallEC; \
    1.90  		typedef rettype RetType; \
    1.91  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    1.92  	\
    1.93 @@ -2655,7 +2655,7 @@
    1.94  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) \
    1.95  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), rettype); } \
    1.96  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10); \
    1.97 -		typedef SourceHook::ExecutableClass10<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10> CallEC; \
    1.98 +		typedef SourceHook::ExecutableClass10< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10 > CallEC; \
    1.99  		typedef rettype RetType; \
   1.100  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.101  	\
   1.102 @@ -2809,7 +2809,7 @@
   1.103  		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) \
   1.104  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), rettype); } \
   1.105  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11); \
   1.106 -		typedef SourceHook::ExecutableClass11<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11> CallEC; \
   1.107 +		typedef SourceHook::ExecutableClass11< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11 > CallEC; \
   1.108  		typedef rettype RetType; \
   1.109  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.110  	\
   1.111 @@ -2963,7 +2963,7 @@
   1.112  		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) \
   1.113  		{ SH_HANDLEFUNC((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); } \
   1.114  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12); \
   1.115 -		typedef SourceHook::ExecutableClass12<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12> CallEC; \
   1.116 +		typedef SourceHook::ExecutableClass12< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12 > CallEC; \
   1.117  		typedef rettype RetType; \
   1.118  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.119  	\
   1.120 @@ -3117,7 +3117,7 @@
   1.121  		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) \
   1.122  		{ SH_HANDLEFUNC((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); } \
   1.123  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13); \
   1.124 -		typedef SourceHook::ExecutableClass13<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13> CallEC; \
   1.125 +		typedef SourceHook::ExecutableClass13< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13 > CallEC; \
   1.126  		typedef rettype RetType; \
   1.127  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.128  	\
   1.129 @@ -3271,7 +3271,7 @@
   1.130  		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) \
   1.131  		{ SH_HANDLEFUNC((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); } \
   1.132  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14); \
   1.133 -		typedef SourceHook::ExecutableClass14<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14> CallEC; \
   1.134 +		typedef SourceHook::ExecutableClass14< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14 > CallEC; \
   1.135  		typedef rettype RetType; \
   1.136  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.137  	\
   1.138 @@ -3425,7 +3425,7 @@
   1.139  		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) \
   1.140  		{ SH_HANDLEFUNC((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); } \
   1.141  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15); \
   1.142 -		typedef SourceHook::ExecutableClass15<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15> CallEC; \
   1.143 +		typedef SourceHook::ExecutableClass15< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15 > CallEC; \
   1.144  		typedef rettype RetType; \
   1.145  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.146  	\
   1.147 @@ -3579,7 +3579,7 @@
   1.148  		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) \
   1.149  		{ SH_HANDLEFUNC((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); } \
   1.150  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16); \
   1.151 -		typedef SourceHook::ExecutableClass16<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16> CallEC; \
   1.152 +		typedef SourceHook::ExecutableClass16< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16 > CallEC; \
   1.153  		typedef rettype RetType; \
   1.154  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   1.155  	\
     2.1 --- a/sourcehook/generate/sourcehook.hxx	Sun Nov 04 13:14:35 2007 +0000
     2.2 +++ b/sourcehook/generate/sourcehook.hxx	Sun Nov 04 13:19:08 2007 +0000
     2.3 @@ -1115,7 +1115,7 @@
     2.4  		virtual rettype Func(@[$2,1,$1|, :param$2 p$2@]) \
     2.5  		{ SH_HANDLEFUNC((@[$2,1,$1|, :param$2@]), (@[$2,1,$1|, :p$2@]), rettype); } \
     2.6  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(@[$2,1,$1|, :param$2@]); \
     2.7 -		typedef SourceHook::ExecutableClass$1<::SourceHook::EmptyClass, ECMFP, rettype@[$2,1,$1:, param$2@]> CallEC; \
     2.8 +		typedef SourceHook::ExecutableClass$1< ::SourceHook::EmptyClass, ECMFP, rettype@[$2,1,$1:, param$2@] > CallEC; \
     2.9  		typedef rettype RetType; \
    2.10  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    2.11  	\
     3.1 --- a/sourcehook/sourcehook.h	Sun Nov 04 13:14:35 2007 +0000
     3.2 +++ b/sourcehook/sourcehook.h	Sun Nov 04 13:19:08 2007 +0000
     3.3 @@ -1115,7 +1115,7 @@
     3.4  		virtual rettype Func() \
     3.5  		{ SH_HANDLEFUNC((), (), rettype); } \
     3.6  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(); \
     3.7 -		typedef SourceHook::ExecutableClass0<::SourceHook::EmptyClass, ECMFP, rettype> CallEC; \
     3.8 +		typedef SourceHook::ExecutableClass0< ::SourceHook::EmptyClass, ECMFP, rettype > CallEC; \
     3.9  		typedef rettype RetType; \
    3.10  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    3.11  	\
    3.12 @@ -1269,7 +1269,7 @@
    3.13  		virtual rettype Func(param1 p1) \
    3.14  		{ SH_HANDLEFUNC((param1), (p1), rettype); } \
    3.15  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1); \
    3.16 -		typedef SourceHook::ExecutableClass1<::SourceHook::EmptyClass, ECMFP, rettype, param1> CallEC; \
    3.17 +		typedef SourceHook::ExecutableClass1< ::SourceHook::EmptyClass, ECMFP, rettype, param1 > CallEC; \
    3.18  		typedef rettype RetType; \
    3.19  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    3.20  	\
    3.21 @@ -1423,7 +1423,7 @@
    3.22  		virtual rettype Func(param1 p1, param2 p2) \
    3.23  		{ SH_HANDLEFUNC((param1, param2), (p1, p2), rettype); } \
    3.24  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2); \
    3.25 -		typedef SourceHook::ExecutableClass2<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2> CallEC; \
    3.26 +		typedef SourceHook::ExecutableClass2< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2 > CallEC; \
    3.27  		typedef rettype RetType; \
    3.28  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    3.29  	\
    3.30 @@ -1577,7 +1577,7 @@
    3.31  		virtual rettype Func(param1 p1, param2 p2, param3 p3) \
    3.32  		{ SH_HANDLEFUNC((param1, param2, param3), (p1, p2, p3), rettype); } \
    3.33  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3); \
    3.34 -		typedef SourceHook::ExecutableClass3<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3> CallEC; \
    3.35 +		typedef SourceHook::ExecutableClass3< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3 > CallEC; \
    3.36  		typedef rettype RetType; \
    3.37  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    3.38  	\
    3.39 @@ -1731,7 +1731,7 @@
    3.40  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4) \
    3.41  		{ SH_HANDLEFUNC((param1, param2, param3, param4), (p1, p2, p3, p4), rettype); } \
    3.42  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4); \
    3.43 -		typedef SourceHook::ExecutableClass4<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4> CallEC; \
    3.44 +		typedef SourceHook::ExecutableClass4< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4 > CallEC; \
    3.45  		typedef rettype RetType; \
    3.46  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    3.47  	\
    3.48 @@ -1885,7 +1885,7 @@
    3.49  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5) \
    3.50  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5), (p1, p2, p3, p4, p5), rettype); } \
    3.51  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5); \
    3.52 -		typedef SourceHook::ExecutableClass5<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5> CallEC; \
    3.53 +		typedef SourceHook::ExecutableClass5< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5 > CallEC; \
    3.54  		typedef rettype RetType; \
    3.55  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    3.56  	\
    3.57 @@ -2039,7 +2039,7 @@
    3.58  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6) \
    3.59  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6), (p1, p2, p3, p4, p5, p6), rettype); } \
    3.60  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6); \
    3.61 -		typedef SourceHook::ExecutableClass6<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6> CallEC; \
    3.62 +		typedef SourceHook::ExecutableClass6< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6 > CallEC; \
    3.63  		typedef rettype RetType; \
    3.64  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    3.65  	\
    3.66 @@ -2193,7 +2193,7 @@
    3.67  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7) \
    3.68  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7), (p1, p2, p3, p4, p5, p6, p7), rettype); } \
    3.69  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7); \
    3.70 -		typedef SourceHook::ExecutableClass7<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7> CallEC; \
    3.71 +		typedef SourceHook::ExecutableClass7< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7 > CallEC; \
    3.72  		typedef rettype RetType; \
    3.73  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    3.74  	\
    3.75 @@ -2347,7 +2347,7 @@
    3.76  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8) \
    3.77  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8), (p1, p2, p3, p4, p5, p6, p7, p8), rettype); } \
    3.78  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8); \
    3.79 -		typedef SourceHook::ExecutableClass8<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8> CallEC; \
    3.80 +		typedef SourceHook::ExecutableClass8< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8 > CallEC; \
    3.81  		typedef rettype RetType; \
    3.82  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    3.83  	\
    3.84 @@ -2501,7 +2501,7 @@
    3.85  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9) \
    3.86  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9), (p1, p2, p3, p4, p5, p6, p7, p8, p9), rettype); } \
    3.87  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9); \
    3.88 -		typedef SourceHook::ExecutableClass9<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9> CallEC; \
    3.89 +		typedef SourceHook::ExecutableClass9< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9 > CallEC; \
    3.90  		typedef rettype RetType; \
    3.91  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
    3.92  	\
    3.93 @@ -2655,7 +2655,7 @@
    3.94  		virtual rettype Func(param1 p1, param2 p2, param3 p3, param4 p4, param5 p5, param6 p6, param7 p7, param8 p8, param9 p9, param10 p10) \
    3.95  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10), rettype); } \
    3.96  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10); \
    3.97 -		typedef SourceHook::ExecutableClass10<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10> CallEC; \
    3.98 +		typedef SourceHook::ExecutableClass10< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10 > CallEC; \
    3.99  		typedef rettype RetType; \
   3.100  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   3.101  	\
   3.102 @@ -2809,7 +2809,7 @@
   3.103  		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) \
   3.104  		{ SH_HANDLEFUNC((param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11), (p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11), rettype); } \
   3.105  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11); \
   3.106 -		typedef SourceHook::ExecutableClass11<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11> CallEC; \
   3.107 +		typedef SourceHook::ExecutableClass11< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11 > CallEC; \
   3.108  		typedef rettype RetType; \
   3.109  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   3.110  	\
   3.111 @@ -2963,7 +2963,7 @@
   3.112  		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) \
   3.113  		{ SH_HANDLEFUNC((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); } \
   3.114  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12); \
   3.115 -		typedef SourceHook::ExecutableClass12<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12> CallEC; \
   3.116 +		typedef SourceHook::ExecutableClass12< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12 > CallEC; \
   3.117  		typedef rettype RetType; \
   3.118  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   3.119  	\
   3.120 @@ -3117,7 +3117,7 @@
   3.121  		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) \
   3.122  		{ SH_HANDLEFUNC((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); } \
   3.123  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13); \
   3.124 -		typedef SourceHook::ExecutableClass13<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13> CallEC; \
   3.125 +		typedef SourceHook::ExecutableClass13< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13 > CallEC; \
   3.126  		typedef rettype RetType; \
   3.127  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   3.128  	\
   3.129 @@ -3271,7 +3271,7 @@
   3.130  		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) \
   3.131  		{ SH_HANDLEFUNC((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); } \
   3.132  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14); \
   3.133 -		typedef SourceHook::ExecutableClass14<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14> CallEC; \
   3.134 +		typedef SourceHook::ExecutableClass14< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14 > CallEC; \
   3.135  		typedef rettype RetType; \
   3.136  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   3.137  	\
   3.138 @@ -3425,7 +3425,7 @@
   3.139  		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) \
   3.140  		{ SH_HANDLEFUNC((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); } \
   3.141  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15); \
   3.142 -		typedef SourceHook::ExecutableClass15<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15> CallEC; \
   3.143 +		typedef SourceHook::ExecutableClass15< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15 > CallEC; \
   3.144  		typedef rettype RetType; \
   3.145  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   3.146  	\
   3.147 @@ -3579,7 +3579,7 @@
   3.148  		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) \
   3.149  		{ SH_HANDLEFUNC((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); } \
   3.150  		typedef rettype(::SourceHook::EmptyClass::*ECMFP)(param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16); \
   3.151 -		typedef SourceHook::ExecutableClass16<::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16> CallEC; \
   3.152 +		typedef SourceHook::ExecutableClass16< ::SourceHook::EmptyClass, ECMFP, rettype, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16 > CallEC; \
   3.153  		typedef rettype RetType; \
   3.154  	SHINT_MAKE_GENERICSTUFF_END_MANUAL(hookname, vtbloffs, vtblidx, thisptroffs) \
   3.155  	\