Changeset 47096 in webkit for trunk/JavaScriptCore/runtime/UString.cpp

Timestamp:

Aug 12, 2009, 1:58:30 AM (16 years ago)

Author:

Simon Hausmann

Message:

Fix compile error on 64Bit Windows, when UString::from
is called with an intptr_t.

Patch by Prasanth Ullattil <​[email protected]> on 2009-08-12
Reviewed by Simon Hausmann.

Added new UString::From overload with long long parameter.

Thanks to Holger for the long long idea.

• runtime/UString.cpp:

(JSC::UString::from):

• runtime/UString.h:

File:

• trunk/JavaScriptCore/runtime/UString.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/UString.cpp

@@ -923 +923 @@
         char minBuf[1 + sizeof(i) * 3];
         sprintf(minBuf, "%d", INT_MIN);
+        return UString(minBuf);
+    } else {
+        bool negative = false;
+        if (i < 0) {
+            negative = true;
+            i = -i;
+        }
+        while (i) {
+            *--p = static_cast<unsigned short>((i % 10) + '0');
+            i /= 10;
+        }
+        if (negative)
+            *--p = '-';
+    }
+
+    return UString(p, static_cast<int>(end - p));
+}
+
+UString UString::from(long long i)
+{
+    UChar buf[1 + sizeof(i) * 3];
+    UChar* end = buf + sizeof(buf) / sizeof(UChar);
+    UChar* p = end;
+
+    if (i == 0)
+        *--p = '0';
+    else if (i == LLONG_MIN) {
+        char minBuf[1 + sizeof(i) * 3];
+        snprintf(minBuf, sizeof(minBuf) - 1, "%I64d", LLONG_MIN);
         return UString(minBuf);
     } else {