mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some missing from merge.

Browse source 
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 • committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dep/acelite/ace/Malloc_Allocator.cpp
View file

@ -1,3 +1,5 @@
// $Id: Malloc_Allocator.cpp 96985 2013-04-11 15:50:32Z huangh $
#include "ace/Malloc_Allocator.h"
#include "ace/Object_Manager.h"
@ -109,6 +111,7 @@ void *
ACE_New_Allocator::malloc (size_t nbytes)
{
char *ptr = 0;
if (nbytes > 0)
ACE_NEW_RETURN (ptr, char[nbytes], 0);
return (void *) ptr;
@ -135,11 +138,7 @@ ACE_New_Allocator::calloc (size_t n_elem, size_t elem_size, char initial_value)
void
ACE_New_Allocator::free (void *ptr)
{
#ifdef ACE_FACE_SAFETY_BASE
ACE_UNUSED_ARG (ptr);
#else
delete [] (char *) ptr;
#endif
}
int