Changeset 9992 in webkit for trunk/JavaScriptCore/kjs/ustring.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/ustring.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -43 +43 @@
 #include "dtoa.h"
 
-#if APPLE_CHANGES
+#include <algorithm>
+
+using std::max;
 
 #include <unicode/uchar.h>
-
-#endif
 
 namespace KJS {
@@ -150 +150 @@
 UChar UChar::toLower() const
 {
-#if APPLE_CHANGES
   return static_cast<unsigned short>(u_tolower(uc));
-#else
-  // ### properly support unicode tolower
-  if (uc >= 256 || islower(uc))
-    return *this;
-
-  return (unsigned char)tolower(uc);
-#endif
 }
 
 UChar UChar::toUpper() const
 {
-#if APPLE_CHANGES
   return static_cast<unsigned short>(u_toupper(uc));
-#else
-  if (uc >= 256 || isupper(uc))
-    return *this;
-
-  return (unsigned char)toupper(uc);
-#endif
 }
 
@@ -641 +626 @@
   UChar *buffer = static_cast<UChar *>(kjs_fast_malloc(totalLength * sizeof(UChar)));
 
-  int maxCount = MAX(rangeCount, separatorCount);
+  int maxCount = max(rangeCount, separatorCount);
   int bufferPos = 0;
   for (int i = 0; i < maxCount; i++) {