mirror of
https://github.com/openmoh/openmohaa.git
synced 2025-04-28 21:57:57 +03:00
Fix compilation fail when DEBUG_MEM is set (#677)
This commit is contained in:
parent
01381ed084
commit
08d0a378f8
2 changed files with 14 additions and 4 deletions
|
@ -98,6 +98,18 @@ void LightClass::operator delete(void *ptr)
|
|||
Z_Free(p);
|
||||
# endif
|
||||
}
|
||||
#else
|
||||
|
||||
void *LightClass::operator new(size_t s)
|
||||
{
|
||||
return ::operator new(s);
|
||||
}
|
||||
|
||||
void LightClass::operator delete(void *ptr)
|
||||
{
|
||||
::operator delete(ptr);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
void* LightClass::operator new(size_t size, void* placement)
|
||||
|
|
|
@ -29,9 +29,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
class LightClass
|
||||
{
|
||||
public:
|
||||
#ifndef _DEBUG_MEM
|
||||
void *operator new(size_t);
|
||||
void operator delete(void *);
|
||||
void *operator new(size_t s);
|
||||
void operator delete(void *ptr);
|
||||
|
||||
void *operator new(size_t size, void *placement);
|
||||
void operator delete(void *ptr, void *placement);
|
||||
|
@ -47,7 +46,6 @@ public:
|
|||
{
|
||||
return operator delete(ptr, (void *)&placement);
|
||||
}
|
||||
#endif
|
||||
};
|
||||
|
||||
void DisplayMemoryUsage();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue