--- deliantra/server/common/utils.C 2006/09/10 16:00:23 1.9 +++ deliantra/server/common/utils.C 2006/09/11 01:16:20 1.10 @@ -1,7 +1,7 @@ /* * static char *rcsid_utils_c = - * "$Id: utils.C,v 1.9 2006/09/10 16:00:23 root Exp $"; + * "$Id: utils.C,v 1.10 2006/09/11 01:16:20 root Exp $"; */ /* @@ -550,32 +550,35 @@ } void * - zero_initialised::operator -new (size_t s) +zero_initialised::operator new (size_t s, void *p) +{ + memset (p, 0, s); + return p; +} + +void * +zero_initialised::operator new (size_t s) { //return calloc (1, s); return g_slice_alloc0 (s); } void * - zero_initialised::operator -new[] (size_t s) + zero_initialised::operator new[] (size_t s) { //return calloc (1, s); return g_slice_alloc0 (s); } void - zero_initialised::operator -delete (void *p, size_t s) +zero_initialised::operator delete (void *p, size_t s) { //free (p); return; g_slice_free1 (s, p); } void - zero_initialised::operator -delete[] (void *p, size_t s) +zero_initialised::operator delete[] (void *p, size_t s) { //free (p); return; g_slice_free1 (s, p);