Changeset 56066 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.cpp

Timestamp:

Mar 16, 2010, 9:19:50 AM (15 years ago)

Author:

[email protected]

Message:

2010-03-16 Zoltan Horvath <​[email protected]>

Reviewed by Darin Adler.

Remove extra <new> include and add guards to operator new/delete definitions
​https://bugs.webkit.org/show_bug.cgi?id=35967

Remove extra <new> header include from FastAlloc.cpp since it is included in
FastAlloc.h. Add ENABLE(GLOBAL_FASTMALLOC_NEW) macro guard to operator
new/delete/new []/delete [] definitions.

• wtf/FastMalloc.cpp:

File:

• trunk/JavaScriptCore/wtf/FastMalloc.cpp (modified) (3 diffs)

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -418 +418 @@
 #include <errno.h>
 #include <limits>
-#include <new>
 #include <pthread.h>
 #include <stdarg.h>
@@ -3943 +3942 @@
 }
 
+#if ENABLE(GLOBAL_FASTMALLOC_NEW)
+
 void* operator new(size_t size) {
   void* p = cpp_alloc(size, false);
@@ -3996 +3997 @@
   do_free(p);
 }
+
+#endif
 
 extern "C" void* memalign(size_t align, size_t size) __THROW {