TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-19 22:53:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed type inference for nulls in console functions

Browse source
This commit is contained in:
Thomas "elfprince13" Dickerson 2017-01-06 14:50:41 -05:00
parent 0ab089468f
commit 3f6c269f6a
17 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Engine/source/console/engineAPI.h
View file

@ -547,9 +547,12 @@ namespace engineAPI{
template<size_t index, size_t method_offset = 0, typename ...RealArgTs>
static IthArgType<index> getRealArgValue(S32 argc, ConsoleValueRef *argv, const _EngineFunctionDefaultArguments< void(RealArgTs...) >& defaultArgs)
{
return (startArgc + index) < argc
? EngineUnmarshallData< IthArgType<index> >()( argv[ startArgc + index ] )
: std::get<index + method_offset>(defaultArgs.mArgs);
if((startArgc + index) < argc)
{
return EngineUnmarshallData< IthArgType<index> >()( argv[ startArgc + index ] );
} else {
return std::get<index + method_offset>(defaultArgs.mArgs);
}
}
template<size_t ...I>