Changeset 127212 in webkit for trunk/Source/JavaScriptCore/runtime/JSString.h

Timestamp:

Aug 30, 2012, 4:41:29 PM (13 years ago)

Author:

[email protected]

Message:

Ambiguous operator[] after r127191 on some compiler
​https://bugs.webkit.org/show_bug.cgi?id=95509

Patch by Benjamin Poulain <​[email protected]> on 2012-08-30
Reviewed by Simon Fraser.

Source/JavaScriptCore:

On some compilers, the operator[] conflicts with the Obj-C++ operators. This attempts to solve
the issue.

• runtime/JSString.h:

(JSC::jsSingleCharacterSubstring):
(JSC::jsString):
(JSC::jsSubstring8):
(JSC::jsSubstring):
(JSC::jsOwnedString):

Source/WTF:

• wtf/text/WTFString.h:

(WTF::String::characterAt): At this as a synonym to operator[] to attempt a build fix.

File:

• trunk/Source/JavaScriptCore/runtime/JSString.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -348 +348 @@
         JSGlobalData* globalData = &exec->globalData();
         ASSERT(offset < static_cast<unsigned>(s.length()));
-        UChar c = s[offset];
+        UChar c = s.characterAt(offset);
         if (c <= maxSingleCharacterString)
             return globalData->smallStrings.singleCharacterString(globalData, c);
@@ -397 +397 @@
             return globalData->smallStrings.emptyString(globalData);
         if (size == 1) {
-            UChar c = s[0];
+            UChar c = s.characterAt(0);
             if (c <= maxSingleCharacterString)
                 return globalData->smallStrings.singleCharacterString(globalData, c);
@@ -423 +423 @@
             return globalData->smallStrings.emptyString(globalData);
         if (length == 1) {
-            UChar c = s[offset];
+            UChar c = s.characterAt(offset);
             if (c <= maxSingleCharacterString)
                 return globalData->smallStrings.singleCharacterString(globalData, c);
@@ -438 +438 @@
             return globalData->smallStrings.emptyString(globalData);
         if (length == 1) {
-            UChar c = s[offset];
+            UChar c = s.characterAt(offset);
             if (c <= maxSingleCharacterString)
                 return globalData->smallStrings.singleCharacterString(globalData, c);
@@ -451 +451 @@
             return globalData->smallStrings.emptyString(globalData);
         if (size == 1) {
-            UChar c = s[0];
+            UChar c = s.characterAt(0);
             if (c <= maxSingleCharacterString)
                 return globalData->smallStrings.singleCharacterString(globalData, c);