rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2024-11-28 10:24:20 +01:00
Code Issues Releases Activity

Stage GCC8+ fixes

Browse Source
This commit is contained in:
Headline 2019-11-01 04:05:50 -07:00
parent de330743d8
commit 8939a75801
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/AMBuilder
View File

@ -31,5 +31,7 @@ for sdk_name in MMS.sdks:
# Source2 hack. TODO: check this more deterministically, "are we doing an x64 build?"
if arch == 'x86':
binary.sources += ['sourcehook/sourcehook_hookmangen.cpp']
if binary.compiler.family == 'gcc' and binary.compiler.version >= 'gcc-8':
binary.compiler.cxxflags += ['-Wno-class-memaccess', '-Wno-format-truncation']
nodes = builder.Add(binary)
MMS.binaries += [nodes]

4
core/sourcehook/sourcehook.h
View File

@ -1541,14 +1541,14 @@ SourceHook::CallClass<T> *SH_GET_CALLCLASS(T *p)
SH_DECL_EXTERN(ifacetype, ifacefunc, attr, overload, rettype, param1, param2)
#define SH_DECL_HOOK2_void(ifacetype, ifacefunc, attr, overload, param1, param2) \
SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (static_cast<void (ifacetype::*)(param1, param2) attr> \
SHINT_MAKE_GENERICSTUFF_BEGIN(ifacetype, ifacefunc, overload, (reinterpret_cast<void (ifacetype::*)(param1, param2) attr> \
(&ifacetype::ifacefunc))) \
typedef fastdelegate::FastDelegate<void, param1, param2> FD; \
MAKE_DELEG_void((param1 p1, param2 p2), (p1, p2)); \
virtual void Func(param1 p1, param2 p2) \
{ SH_HANDLEFUNC_void((param1, param2), (p1, p2)); } \
SHINT_MAKE_GENERICSTUFF_END(ifacetype, ifacefunc, overload, \
(static_cast<void (ifacetype::*)(param1, param2) attr>(&ifacetype::ifacefunc))) \
(reinterpret_cast<void (ifacetype::*)(param1, param2) attr>(&ifacetype::ifacefunc))) \
\
const ::SourceHook::PassInfo __SourceHook_ParamInfos_##ifacetype##ifacefunc##overload[] = { {1, 0, 0},__SH_GPI(param1),__SH_GPI(param2) }; \
const ::SourceHook::PassInfo::V2Info __SourceHook_ParamInfos2_##ifacetype##ifacefunc##overload[] = { __SH_EPI, __SH_EPI, __SH_EPI }; \