Changeset 9992 in webkit for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

Jul 31, 2005, 10:02:13 PM (20 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• remove uses of Mac-OS-X-specific MAX macro
• remove one of the many excess "APPLE_CHANGES" ifdefs

• kjs/collector.cpp: (KJS::Collector::allocate): Use std::max instead of MAX.
• kjs/property_map.cpp: (KJS::PropertyMap::rehash): Ditto.
• kjs/ustring.cpp: (KJS::UChar::toLower): Take out non-ICU code path. (KJS::UChar::toUpper): Ditto. (KJS::UString::spliceSubstringsWithSeparators): Use std::max instead of MAX.

File:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -27 +27 @@
 #include "value.h"
 
+#include <algorithm>
+
 #if APPLE_CHANGES
 #include <CoreFoundation/CoreFoundation.h>
@@ -34 +36 @@
 #include <mach/thread_act.h>
 #endif
+
+using std::max;
 
 namespace KJS {
@@ -102 +106 @@
     // oversize allocator
     if (heap.usedOversizeCells == heap.numOversizeCells) {
-      heap.numOversizeCells = MAX(MIN_ARRAY_SIZE, heap.numOversizeCells * GROWTH_FACTOR);
+      heap.numOversizeCells = max(MIN_ARRAY_SIZE, heap.numOversizeCells * GROWTH_FACTOR);
       heap.oversizeCells = (CollectorCell **)kjs_fast_realloc(heap.oversizeCells, heap.numOversizeCells * sizeof(CollectorCell *));
     }
@@ -132 +136 @@
     
     if (heap.usedBlocks == heap.numBlocks) {
-      heap.numBlocks = MAX(MIN_ARRAY_SIZE, heap.numBlocks * GROWTH_FACTOR);
+      heap.numBlocks = max(MIN_ARRAY_SIZE, heap.numBlocks * GROWTH_FACTOR);
       heap.blocks = (CollectorBlock **)kjs_fast_realloc(heap.blocks, heap.numBlocks * sizeof(CollectorBlock *));
     }