H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2026-08-07 17:29:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation under MSVC(VS2019)

Browse Source
This commit is contained in:
JusicP
2022-01-13 16:18:38 +02:00
parent 94fb7d4c00
commit 5e27785d40
127 changed files with 195 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/tier0/memalloc.h
+1 -1
View File
@@ -383,7 +383,7 @@ public:
#pragma warning(disable:4290)
#pragma warning(push)
#include <typeinfo.h>
#include <typeinfo>
// MEM_DEBUG_CLASSNAME is opt-in.
// Note: typeid().name() is not threadsafe, so if the project needs to access it in multiple threads
public/tier0/memoverride.cpp
+4 -4
View File
@@ -203,12 +203,12 @@ ALLOC_CALL void *_realloc_base( void *pMem, size_t nSize )
return ReallocUnattributed( pMem, nSize );
}
ALLOC_CALL void *_recalloc_base( void *pMem, size_t nSize )
ALLOC_CALL void *_recalloc_base( void *pMem, size_t nCount, size_t nSize )
{
void *pMemOut = ReallocUnattributed( pMem, nSize );
void *pMemOut = ReallocUnattributed( pMem, nCount * nSize );
if ( !pMem )
{
memset( pMemOut, 0, nSize );
memset( pMemOut, 0, nCount * nSize);
}
return pMemOut;
}
@@ -242,7 +242,7 @@ void * __cdecl _realloc_crt(void *ptr, size_t size)
void * __cdecl _recalloc_crt(void *ptr, size_t count, size_t size)
{
return _recalloc_base( ptr, size * count );
return _recalloc_base( ptr, size, count );
}
ALLOC_CALL void * __cdecl _recalloc ( void * memblock, size_t count, size_t size )