1.1 --- a/sourcehook/generate/sh_memfuncinfo.hxx Sat May 13 16:59:57 2006 +0000
1.2 +++ b/sourcehook/generate/sh_memfuncinfo.hxx Sat May 13 17:57:35 2006 +0000
1.3 @@ -289,42 +289,41 @@
1.4 }
1.5
1.6 // Versions which do take a this
1.7 -@VARARGS@
1.8 - template<class X, class Y, class RetType@, @@class Param%%|, @>
1.9 - inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(@Param%%|, @), MemFuncInfo &out)
1.10 +@[$1,0,$a:
1.11 + template<class X, class Y, class RetType@[$1!=0:, @]@[$2,1,$1|, :class Param$2@]>
1.12 + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(@[$2,1,$1|, :Param$2@]), MemFuncInfo &out)
1.13 {
1.14 - RetType(Y::*mfp2)(@Param%%|, @) = mfp;
1.15 + RetType(Y::*mfp2)(@[$2,1,$1|, :Param$2@]) = mfp;
1.16 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.17 }
1.18
1.19 - template<class X, class Y, class RetType@, @@class Param%%|, @>
1.20 - inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(@Param%%|, @) const, MemFuncInfo &out)
1.21 + template<class X, class Y, class RetType@[$1!=0:, @]@[$2,1,$1|, :class Param$2@]>
1.22 + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(@[$2,1,$1|, :Param$2@]) const, MemFuncInfo &out)
1.23 {
1.24 - RetType(Y::*mfp2)(@Param%%|, @) const = mfp;
1.25 + RetType(Y::*mfp2)(@[$2,1,$1|, :Param$2@]) const = mfp;
1.26 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.27 }
1.28 -
1.29 -@ENDARGS@
1.30 +@]
1.31
1.32 // GCC & MSVC 7.1 need this, MSVC 7.0 doesn't like it
1.33 #if SH_COMP != SH_COMP_MSVC || _MSC_VER > 1300
1.34
1.35 -@VARARGS@
1.36 - template<class X, class Y, class RetType@, @@class Param%%|, @>
1.37 - inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(@Param%%|, @@, @...), MemFuncInfo &out)
1.38 +@[$1,0,$a:
1.39 + template<class X, class Y, class RetType@[$1!=0:, @]@[$2,1,$1|, :class Param$2@]>
1.40 + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(@[$2,1,$1|, :Param$2@]@[$1!=0:, @]...), MemFuncInfo &out)
1.41 {
1.42 - RetType(Y::*mfp2)(@Param%%|, @@, @...) = mfp;
1.43 + RetType(Y::*mfp2)(@[$2,1,$1|, :Param$2@]@[$1!=0:, @]...) = mfp;
1.44 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.45 }
1.46
1.47 - template<class X, class Y, class RetType@, @@class Param%%|, @>
1.48 - inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(@Param%%|, @@, @...) const, MemFuncInfo &out)
1.49 + template<class X, class Y, class RetType@[$1!=0:, @]@[$2,1,$1|, :class Param$2@]>
1.50 + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(@[$2,1,$1|, :Param$2@]@[$1!=0:, @]...) const, MemFuncInfo &out)
1.51 {
1.52 - RetType(Y::*mfp2)(@Param%%|, @@, @...) const = mfp;
1.53 + RetType(Y::*mfp2)(@[$2,1,$1|, :Param$2@]@[$1!=0:, @]...) const = mfp;
1.54 MFI_Impl<sizeof(mfp2)>::GetFuncInfo(mfp2, out);
1.55 }
1.56
1.57 -@ENDARGS@
1.58 +@]
1.59
1.60 #endif
1.61