Merge remote-tracking branch 'origin/master' into 1.10
This commit is contained in:
@@ -272,7 +272,7 @@ bool PlatformBase::Is64BitApp()
|
||||
|
||||
int32 PlatformBase::GetCacheLineSize()
|
||||
{
|
||||
return Platform::GetCPUInfo().CacheLineSize;
|
||||
return (int32)Platform::GetCPUInfo().CacheLineSize;
|
||||
}
|
||||
|
||||
void PlatformBase::Fatal(const StringView& msg, void* context, FatalErrorType error)
|
||||
|
||||
Reference in New Issue
Block a user