Changeset 18716 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 9, 2007, 1:11:27 PM (18 years ago)

Author:

darin

Message:

• fix build on platforms where Unicode::UChar is != uint16_t

• kjs/string_object.cpp: (KJS::StringProtoFunc::callAsFunction): Change types.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/string_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-01-09  Darin Adler  <[email protected]>
+
+        - fix build on platforms where Unicode::UChar is != uint16_t
+
+        * kjs/string_object.cpp: (KJS::StringProtoFunc::callAsFunction):
+        Change types.
+
 2007-01-09  Mitz Pettel  <[email protected]>
 

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -683 +683 @@
     u = s;
     u.copyForWriting();
-    uint16_t* dataPtr = reinterpret_cast<uint16_t*>(u.rep()->data());
-    uint16_t* destIfNeeded;
+    Unicode::UChar* dataPtr = reinterpret_cast<Unicode::UChar*>(u.rep()->data());
+    Unicode::UChar* destIfNeeded;
 
     int len = Unicode::toLower(dataPtr, u.size(), destIfNeeded);
     if (len >= 0)
-        result = jsString(UString(reinterpret_cast<UChar *>(destIfNeeded ? destIfNeeded : dataPtr), len));
+        result = jsString(UString(reinterpret_cast<UChar*>(destIfNeeded ? destIfNeeded : dataPtr), len));
     else
         result = jsString(s);
@@ -699 +699 @@
     u = s;
     u.copyForWriting();
-    uint16_t* dataPtr = reinterpret_cast<uint16_t*>(u.rep()->data());
-    uint16_t* destIfNeeded;
+    Unicode::UChar* dataPtr = reinterpret_cast<Unicode::UChar*>(u.rep()->data());
+    Unicode::UChar* destIfNeeded;
 
     int len = Unicode::toUpper(dataPtr, u.size(), destIfNeeded);