rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-02-12 06:54:31 +01:00
Code Issues Releases Activity

Possible fix for MSVC 7.1 SH_CALL on varargs

Browse Source 
--HG--
extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%4063
This commit is contained in:
Pavol Marko 2005-05-05 21:02:31 +00:00
parent 9a5437c0f1
commit 818c3990e9
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sourcehook/generate/sh_memfuncinfo.hxx
View File

@ -306,8 +306,8 @@ namespace SourceHook
@ENDARGS@ @ENDARGS@
// GCC needs this, MSVC doesn't like them // GCC & MSVC 7.1 need this, MSVC 7.0 doesn't like it
#if SH_COMP != SH_COMP_MSVC #if SH_COMP != SH_COMP_MSVC || _MSC_VER > 1300
@VARARGS@ @VARARGS@
template<class X, class Y, class RetType@, @@class Param%%|, @> template<class X, class Y, class RetType@, @@class Param%%|, @>

5
sourcehook/generate/sourcehook.hxx
View File

@ -773,9 +773,8 @@ SH_CALL2(SourceHook::CallClass<Y> *ptr, MFP mfp, RetType(X::*mfp2)(@Param%%|, @)
@ENDARGS@ @ENDARGS@
#if SH_COMP != SH_COMP_MSVC #if SH_COMP != SH_COMP_MSVC || _MSC_VER > 1300
// GCC & MSVC 7.1 need this, MSVC 7.0 doesn't like it
// **** MSVC doesn't like these, GCC needs them ****
@VARARGS@ @VARARGS@
// Support for @$@ arguments // Support for @$@ arguments

4
sourcehook/sh_memfuncinfo.h
View File

@ -528,8 +528,8 @@ namespace SourceHook
} }
// GCC needs this, MSVC doesn't like them // GCC & MSVC 7.1 need this, MSVC 7.0 doesn't like it
#if SH_COMP != SH_COMP_MSVC #if SH_COMP != SH_COMP_MSVC || _MSC_VER > 1300
template<class X, class Y, class RetType> template<class X, class Y, class RetType>
inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(...), MemFuncInfo &out) inline void GetFuncInfo(Y *ptr, RetType(X::*mfp)(...), MemFuncInfo &out)

5
sourcehook/sourcehook.h
View File

@ -1887,9 +1887,8 @@ SH_CALL2(SourceHook::CallClass<Y> *ptr, MFP mfp, RetType(X::*mfp2)(Param1, Param
} }
#if SH_COMP != SH_COMP_MSVC #if SH_COMP != SH_COMP_MSVC || _MSC_VER > 1300
// GCC & MSVC 7.1 need this, MSVC 7.0 doesn't like it
// **** MSVC doesn't like these, GCC needs them ****
// Support for 0 arguments // Support for 0 arguments
template <class X, class Y, class MFP, class RetType> template <class X, class Y, class MFP, class RetType>

3
sourcehook/test/test.vcproj
View File

@ -229,6 +229,9 @@
<File <File
RelativePath="test3.cpp"> RelativePath="test3.cpp">
</File> </File>
<File
RelativePath="test4.cpp">
</File>
</Filter> </Filter>
<Filter <Filter
Name="Header Files" Name="Header Files"