Reviewed by Darin.

        One more attempt - use reinterpret_cast, rather than static_cast.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13742 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index bb37e630d55941d734de10838b22d3b19d6592ec..feaadbcf93474a78a44248f5049d347687aad299 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-08  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        One more attempt - use reinterpret_cast, rather than static_cast.
+
 2006-04-08  Alexey Proskuryakov  <ap@nypop.com>
 
         Reviewed by Darin.

diff --git a/JavaScriptCore/kxmlcore/unicode/icu/UnicodeIcu.h b/JavaScriptCore/kxmlcore/unicode/icu/UnicodeIcu.h
index 67a6ce74199ff49cff77d4546f0f3537b704c4e0..c0558280cb3dce9f65ee5d8fb0f7d3ef0dff29f9 100644 (file)
--- a/JavaScriptCore/kxmlcore/unicode/icu/UnicodeIcu.h
+++ b/JavaScriptCore/kxmlcore/unicode/icu/UnicodeIcu.h
@@ -38,15 +38,15 @@ namespace KXMLCore {
       int resultLength;
       destIfNeeded = 0;
 
-      resultLength = u_strToLower(0, 0, static_cast< ::UChar*>(str), strLength, "", &err);
+      resultLength = u_strToLower(0, 0, reinterpret_cast< ::UChar*>(str), strLength, "", &err);
 
       if (resultLength <= strLength) {
         err = U_ZERO_ERROR;
-        u_strToLower(static_cast< ::UChar*>(str), resultLength, static_cast< ::UChar*>(str), strLength, "", &err);
+        u_strToLower(reinterpret_cast< ::UChar*>(str), resultLength, reinterpret_cast< ::UChar*>(str), strLength, "", &err);
       } else {
         err = U_ZERO_ERROR;
         destIfNeeded = (uint16_t*)malloc(resultLength * sizeof(uint16_t));
-        u_strToLower(destIfNeeded, resultLength, str, strLength, "", &err);
+        u_strToLower(reinterpret_cast< ::UChar*>(destIfNeeded), resultLength, reinterpret_cast< ::UChar*>(str), strLength, "", &err);
       }
 
       return U_FAILURE(err) ? -1 : resultLength;
@@ -58,15 +58,15 @@ namespace KXMLCore {
       int resultLength;
       destIfNeeded = 0;
 
-      resultLength = u_strToUpper(0, 0, static_cast< ::UChar*>(str), strLength, "", &err);
+      resultLength = u_strToUpper(0, 0, reinterpret_cast< ::UChar*>(str), strLength, "", &err);
 
       if (resultLength <= strLength) {
         err = U_ZERO_ERROR;
-        u_strToUpper(static_cast< ::UChar*>(str), resultLength, static_cast< ::UChar*>(str), strLength, "", &err);
+        u_strToUpper(reinterpret_cast< ::UChar*>(str), resultLength, reinterpret_cast< ::UChar*>(str), strLength, "", &err);
       } else {
         err = U_ZERO_ERROR;
         destIfNeeded = (uint16_t*)malloc(resultLength * sizeof(uint16_t));
-        u_strToUpper(destIfNeeded, resultLength, str, strLength, "", &err);
+        u_strToUpper(reinterpret_cast< ::UChar*>(destIfNeeded), resultLength, reinterpret_cast< ::UChar*>(str), strLength, "", &err);
       }
 
       return U_FAILURE(err) ? -1 : resultLength;