--- parser3/src/include/pa_memory.h	2003/03/25 10:25:25	1.1.2.9.2.14
+++ parser3/src/include/pa_memory.h	2003/09/22 09:19:18	1.4
@@ -9,13 +9,12 @@
 #ifndef PA_MEMORY_H
 #define PA_MEMORY_H
 
-static const char* IDENT_MEMORY_H="$Date: 2003/03/25 10:25:25 $";
-
-#define PA_DEBUG_REFERENCES
+static const char* IDENT_MEMORY_H="$Date: 2003/09/22 09:19:18 $";
 
 // include
 
 #include "pa_config_includes.h"
+
 #include "gc.h"
 
 
@@ -25,6 +24,23 @@ static const char* IDENT_MEMORY_H="$Date
 #	include "libxml/tree.h"
 #endif
 
+// defines
+
+//#define PA_DEBUG_GC_MEMORY
+
+#ifdef PA_DEBUG_GC_MEMORY
+void* pa_gc_malloc(size_t size);
+void* pa_gc_malloc_atomic(size_t size);
+void* pa_gc_realloc(void* ptr, size_t size);
+void pa_gc_free(void* ptr);
+#else
+inline void* pa_gc_malloc(size_t size) { return GC_MALLOC(size); }
+inline void* pa_gc_malloc_atomic(size_t size) { return GC_MALLOC_ATOMIC(size); }
+inline void* pa_gc_realloc(void* ptr, size_t size) { return GC_REALLOC(ptr, size); }
+inline void pa_gc_free(void* ptr) { GC_FREE(ptr); }
+#endif
+
+
 // forwards
 
 void *pa_fail_alloc(const char* what, size_t size);
@@ -32,27 +48,26 @@ void *pa_fail_alloc(const char* what, si
 // inlines
 
 inline void *pa_malloc(size_t size) {
-	if(void *result=GC_MALLOC(size))
+	if(void *result=pa_gc_malloc(size))
 		return result;
 
 	return pa_fail_alloc("allocate", size);
 }
 
 inline void *pa_malloc_atomic(size_t size) {
-	if(void *result=GC_MALLOC_ATOMIC(size))
+	if(void *result=pa_gc_malloc_atomic(size))
 		return result;
 
 	return pa_fail_alloc("allocate clean", size);
 }
 /// @a length may be null, which mean "autocalc it"
-inline char *pa_strdup(const char* auto_variable_never_null, size_t length=0) {
-	if(!length)
-		length=strlen(auto_variable_never_null);
-
-	size_t size=length+1;
-	if(char *result=static_cast<char*>(GC_MALLOC_ATOMIC(size))) {
-		memcpy(result, auto_variable_never_null, length);
-		result[length]=0;
+inline char *pa_strdup(const char* auto_variable_never_null, size_t helper_length=0) {
+	size_t known_length=(helper_length?helper_length:strlen(auto_variable_never_null));
+
+	size_t size=known_length+1;
+	if(char *result=static_cast<char*>(pa_gc_malloc_atomic(size))) {
+		memcpy(result, auto_variable_never_null, size);
+		result[known_length]=0;
 		return result;
 	}
 
@@ -60,19 +75,19 @@ inline char *pa_strdup(const char* auto_
 }
 
 inline void pa_free(void *ptr) {
-	GC_FREE(ptr);
+	pa_gc_free(ptr);
 }
 
 inline void *pa_realloc(void *ptr, size_t size) {
-	if(void *result=GC_REALLOC(ptr, size))
+	if(void *result=pa_gc_realloc(ptr, size))
 		return result;
 
 	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 size) { abort(); } // disabled
-inline void *operator new[] (size_t size) { abort(); } // disabled
+inline void *operator new(size_t) { abort(); } // disabled
+inline void *operator new[] (size_t) { abort(); } // disabled
 //}@
 
 #define UseGC ((int)1)
@@ -118,8 +133,8 @@ public:
 	static void *malloc_atomic(size_t size) {
 		return pa_malloc_atomic(size);
 	}
-	static char *strdup(const char* auto_variable_never_null, size_t length=0) {
-		return pa_strdup(auto_variable_never_null, length);
+	static char *strdup(const char* auto_variable_never_null, size_t helper_length=0) {
+		return pa_strdup(auto_variable_never_null, helper_length);
 	}
 	static void free(void *ptr) {
 		pa_free(ptr);
@@ -137,13 +152,12 @@ private: // disabled from accidental use
 
 /// Those who want their destructor called during finalization, must derive from this class [also]
 class PA_Cleaned {
-
+#ifndef PA_DEBUG_DISABLE_GC
 	static void cleanup( void* obj, void* displ ) {
 	    ((PA_Cleaned*) ((char*) obj + (ptrdiff_t) displ))->~PA_Cleaned();
 	}
 
 public:
-
 	PA_Cleaned() {
 		GC_finalization_proc oldProc;
 		void* oldData;
@@ -162,7 +176,7 @@ public:
 	virtual ~PA_Cleaned() {
 	    GC_REGISTER_FINALIZER_IGNORE_SELF( GC_base(this), 0, 0, 0, 0 );
 	}
-
+#endif
 };
 
 /// Base for all Parser classes