# HG changeset patch # User Pavol Marko # Date 1115298796 0 # Node ID 8edcba00a1038741154577eac2d05f68e29816c5 # Parent 71016f9525037580a89a099860d8b954c93ca57a Linux/GCC/32 compatibility diff -r 71016f952503 -r 8edcba00a103 sourcehook/generate/generate --- a/sourcehook/generate/generate Thu May 05 10:40:47 2005 +0000 +++ b/sourcehook/generate/generate Thu May 05 13:13:16 2005 +0000 @@ -1,6 +1,7 @@ #/bin/sh ./shworker.bin iter $1 sourcehook.hxx sourcehook.h +./shworker.bin iter $1 sh_memfuncinfo.hxx sh_memfuncinfo.h ./shworker.bin hopter $1 FastDelegate.hxx FastDelegate.h cp *.h .. diff -r 71016f952503 -r 8edcba00a103 sourcehook/generate/sh_memfuncinfo.hxx --- a/sourcehook/generate/sh_memfuncinfo.hxx Thu May 05 10:40:47 2005 +0000 +++ b/sourcehook/generate/sh_memfuncinfo.hxx Thu May 05 13:13:16 2005 +0000 @@ -305,6 +305,29 @@ } @ENDARGS@ + + // GCC needs this, MSVC doesn't like them +#if SH_COMP != SH_COMP_MSVC + +@VARARGS@ + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(@Param%%|, @@, @...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(@Param%%|, @@, @...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(@Param%%|, @@, @...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(@Param%%|, @@, @...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + +@ENDARGS@ + +#endif + } #endif diff -r 71016f952503 -r 8edcba00a103 sourcehook/sh_memfuncinfo.h --- a/sourcehook/sh_memfuncinfo.h Thu May 05 10:40:47 2005 +0000 +++ b/sourcehook/sh_memfuncinfo.h Thu May 05 13:13:16 2005 +0000 @@ -527,6 +527,251 @@ MFI_Impl::GetFuncInfo(mfp2, out); } + + // GCC needs this, MSVC doesn't like them +#if SH_COMP != SH_COMP_MSVC + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...), MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...) = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + template + inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...) const, MemFuncInfo &out) + { + RetType(Y::*mfp2)(Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8, Param9, Param10, Param11, Param12, Param13, Param14, Param15, Param16, ...) const = mfp; + MFI_Impl::GetFuncInfo(mfp2, out); + } + + +#endif + } #endif diff -r 71016f952503 -r 8edcba00a103 sourcehook/test/Makefile --- a/sourcehook/test/Makefile Thu May 05 10:40:47 2005 +0000 +++ b/sourcehook/test/Makefile Thu May 05 13:13:16 2005 +0000 @@ -1,21 +1,24 @@ CC=gcc CCFLAGS=-c -g -I.. -DSH_DEBUG -test.bin: bin bin/main.o bin/test1.o bin/test2.o bin/sourcehook.o - $(CC) bin/main.o bin/test1.o bin/test2.o bin/sourcehook.o -lstdc++ -o test.bin +test.bin: bin bin/main.o bin/test1.o bin/test2.o bin/test3.o bin/sourcehook.o + $(CC) bin/main.o bin/test1.o bin/test2.o bin/test3.o bin/sourcehook.o -lstdc++ -o test.bin bin: mkdir bin bin/main.o: main.cpp ../sourcehook.h $(CC) $(CCFLAGS) -o bin/main.o main.cpp - + bin/test1.o: test1.cpp ../sourcehook.h $(CC) $(CCFLAGS) -o bin/test1.o test1.cpp - + bin/test2.o: test2.cpp ../sourcehook.h $(CC) $(CCFLAGS) -o bin/test2.o test2.cpp +bin/test3.o: test3.cpp ../sourcehook.h + $(CC) $(CCFLAGS) -o bin/test3.o test3.cpp + bin/sourcehook.o: ../sourcehook.cpp ../sourcehook.h $(CC) $(CCFLAGS) -o bin/sourcehook.o ../sourcehook.cpp diff -r 71016f952503 -r 8edcba00a103 sourcehook/test/test3.cpp --- a/sourcehook/test/test3.cpp Thu May 05 10:40:47 2005 +0000 +++ b/sourcehook/test/test3.cpp Thu May 05 13:13:16 2005 +0000 @@ -236,4 +236,5 @@ SH_RELEASE_CALLCLASS(pD_CC); return true; -} \ No newline at end of file +} +