--- parser3/src/include/pa_memory.h 2003/09/22 09:19:18 1.4 +++ parser3/src/include/pa_memory.h 2009/04/18 00:33:34 1.17 @@ -1,7 +1,7 @@ /** @file Parser: memory reference counting classes decls. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -9,23 +9,18 @@ #ifndef PA_MEMORY_H #define PA_MEMORY_H -static const char* IDENT_MEMORY_H="$Date: 2003/09/22 09:19:18 $"; +static const char * const IDENT_MEMORY_H="$Date: 2009/04/18 00:33:34 $"; // include #include "pa_config_includes.h" - #include "gc.h" - -#ifdef XML -# include "gdome.h" -// for xmlChar -# include "libxml/tree.h" -#endif - // defines +// use destructors for Array, Hash and VMethodFrame +#define USE_DESTRUCTORS + //#define PA_DEBUG_GC_MEMORY #ifdef PA_DEBUG_GC_MEMORY @@ -66,7 +61,7 @@ inline char *pa_strdup(const char* auto_ size_t size=known_length+1; if(char *result=static_cast(pa_gc_malloc_atomic(size))) { - memcpy(result, auto_variable_never_null, size); + memcpy(result, auto_variable_never_null, known_length); result[known_length]=0; return result; } @@ -85,9 +80,13 @@ inline void *pa_realloc(void *ptr, size_ return pa_fail_alloc("reallocate to", size); } -//{@ these operators are disabled, one should explicitely specify either new(UseGC) or new(PointerFreeGC) -inline void *operator new(size_t) { abort(); } // disabled -inline void *operator new[] (size_t) { abort(); } // disabled +//{@ these operators can be used from stl. to be on a safe side, assume that data may contain pointers +inline void *operator new[] (size_t size) { + return pa_malloc(size); +} +inline void *operator new(size_t size) { + return pa_malloc(size); +} //}@ #define UseGC ((int)1)