Import of Xpdf 2.01 for merge

[evince.git] / pdf / goo / gmempp.cc

diff --git a/pdf/goo/gmempp.cc b/pdf/goo/gmempp.cc
index 41dd441cd05ae0aef891d585eaf4b6a9489f82b3..ed94f7a1d16163b41173d700c2a38b058860a6e6 100644 (file)
--- a/pdf/goo/gmempp.cc
+++ b/pdf/goo/gmempp.cc
@@ -4,20 +4,29 @@
 //
 // Use gmalloc/gfree for C++ new/delete operators.
 //
 //
 // Use gmalloc/gfree for C++ new/delete operators.
 //

-// Copyright 1996 Derek B. Noonburg
+// Copyright 1996-2002 Glyph & Cog, LLC

 //
 //========================================================================
 
 //
 //========================================================================
 

+#include <aconf.h>

 #include "gmem.h"
 
 #ifdef DEBUG_MEM
 #include "gmem.h"
 
 #ifdef DEBUG_MEM

-void *operator new(long size) {
+
+void *operator new(size_t size) {
+  return gmalloc((int)size);
+}
+
+void *operator new[](size_t size) {

   return gmalloc((int)size);
 }
   return gmalloc((int)size);
 }

-#endif

 
 

-#ifdef DEBUG_MEM

 void operator delete(void *p) {
   gfree(p);
 }
 void operator delete(void *p) {
   gfree(p);
 }

+
+void operator delete[](void *p) {
+  gfree(p);
+}
+

 #endif
 #endif