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

Timestamp:

Aug 10, 2009, 12:42:10 PM (16 years ago)

Author:

Darin Adler

Message:

FastMalloc.h has cross-platform code but marked as WinCE-only
​https://bugs.webkit.org/show_bug.cgi?id=28160

Patch by Darin Adler <Darin Adler> on 2009-08-10
Reviewed by Mark Rowe.

1) The support for nothrow was inside #if PLATFORM(WINCE) even though it is

not platform-specific.

2) The code tried to override operator delete nothrow, which does not exist.
3) The code in the header checks the value of USE_SYSTEM_MALLOC, but the code

in FastMalloc.cpp checks only if the macro is defined.

• wtf/FastMalloc.h: See above.
• wtf/FastMalloc.cpp: Ditto.

File:

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

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -1 +1 @@
 // Copyright (c) 2005, 2007, Google Inc.
 // All rights reserved.
-// Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
@@ -90 +90 @@
 #endif
 
-#if !defined(USE_SYSTEM_MALLOC) && defined(NDEBUG)
+#if !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC) && defined(NDEBUG)
 #define FORCE_SYSTEM_MALLOC 0
 #else
 #define FORCE_SYSTEM_MALLOC 1
 #endif
-
 
 // Use a background thread to periodically scavenge memory to release back to the system