mirror of
https://github.com/nillerusr/source-engine.git
synced 2026-08-12 19:59:09 +00:00
Initial android support
This commit is contained in:
@@ -390,9 +390,7 @@ extern "C"
|
||||
// ensures they are here even when linking against debug or release static libs
|
||||
//-----------------------------------------------------------------------------
|
||||
#ifndef NO_MEMOVERRIDE_NEW_DELETE
|
||||
#ifdef OSX
|
||||
void *__cdecl operator new( size_t nSize ) throw (std::bad_alloc)
|
||||
#elif ANDROID
|
||||
#if defined (OSX) || defined (ANDROID)
|
||||
void *__cdecl operator new( size_t nSize ) throw (std::bad_alloc)
|
||||
#else
|
||||
void *__cdecl operator new( size_t nSize )
|
||||
@@ -406,9 +404,7 @@ void *__cdecl operator new( size_t nSize, int nBlockUse, const char *pFileName,
|
||||
return g_pMemAlloc->Alloc(nSize, pFileName, nLine);
|
||||
}
|
||||
|
||||
#ifdef OSX
|
||||
void __cdecl operator delete( void *pMem ) throw()
|
||||
#elif ANDROID
|
||||
#if defined (OSX) || defined (ANDROID)
|
||||
void __cdecl operator delete( void *pMem ) throw()
|
||||
#else
|
||||
void __cdecl operator delete( void *pMem )
|
||||
@@ -416,10 +412,7 @@ void __cdecl operator delete( void *pMem )
|
||||
{
|
||||
g_pMemAlloc->Free( pMem );
|
||||
}
|
||||
|
||||
#ifdef OSX
|
||||
void operator delete(void*pMem, std::size_t)
|
||||
#elif ANDROID
|
||||
#if defined (OSX) || defined (ANDROID)
|
||||
void operator delete(void*pMem, std::size_t)
|
||||
#else
|
||||
void operator delete(void*pMem, std::size_t) throw()
|
||||
@@ -428,9 +421,7 @@ void operator delete(void*pMem, std::size_t) throw()
|
||||
g_pMemAlloc->Free( pMem );
|
||||
}
|
||||
|
||||
#ifdef OSX
|
||||
void *__cdecl operator new[]( size_t nSize ) throw (std::bad_alloc)
|
||||
#elif ANDROID
|
||||
#if defined (OSX) || defined (ANDROID)
|
||||
void *__cdecl operator new[]( size_t nSize ) throw (std::bad_alloc)
|
||||
#else
|
||||
void *__cdecl operator new[]( size_t nSize )
|
||||
@@ -444,9 +435,7 @@ void *__cdecl operator new[] ( size_t nSize, int nBlockUse, const char *pFileNam
|
||||
return g_pMemAlloc->Alloc(nSize, pFileName, nLine);
|
||||
}
|
||||
|
||||
#ifdef OSX
|
||||
void __cdecl operator delete[]( void *pMem ) throw()
|
||||
#elif ANDROID
|
||||
#if defined (OSX) || defined (ANDROID)
|
||||
void __cdecl operator delete[]( void *pMem ) throw()
|
||||
#else
|
||||
void __cdecl operator delete[]( void *pMem )
|
||||
|
||||
Reference in New Issue
Block a user