Changeset 206

Timestamp:

Dec 9, 2010, 3:01:46 PM (15 years ago)

Author:

dmik

Message:

jdk: delete and delete[] operators are different in GNU C++ but both should call a debug free routine because both new and new[] allocations are done by the debug malloc routine. Fixes a crash at delete[] something.

File:

• trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Debug.h (modified) (2 diffs)

trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Debug.h

@@ -50 +50 @@
     extern void * operator new(size_t size, const char * filename, int linenumber);
 #ifdef __GNUC__
-    inline void * operator new[](size_t size, const char * filename, int linenumber)
-    {
+    inline void * operator new[](size_t size, const char * filename, int linenumber) {
         return operator new(size, filename, linenumber);
     }
@@ -60 +59 @@
 #endif
     extern void operator delete(void *ptr);
+#ifdef __GNUC__
+    inline void operator delete[](void *ptr) {
+        return operator delete(ptr);
+    }
+#endif
     extern void DumpClipRectangle(const char * file, int line, int argc, const char * fmt, va_list arglist);
     extern void DumpUpdateRectangle(const char * file, int line, int argc, const char * fmt, va_list arglist);