Title: [129698] trunk/Source/WebCore
- Revision
- 129698
- Author
- [email protected]
- Date
- 2012-09-26 13:45:03 -0700 (Wed, 26 Sep 2012)
Log Message
Unreviewed speculative build fix for clang.
Added explicit static_cast from int64_t to int32_t.
* platform/text/TextBreakIteratorICU.cpp:
(WebCore::uTextLatin1Clone):
(WebCore::uTextLatin1Extract):
(WebCore::uTextLatin1MapNativeIndexToUTF16):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (129697 => 129698)
--- trunk/Source/WebCore/ChangeLog 2012-09-26 20:34:51 UTC (rev 129697)
+++ trunk/Source/WebCore/ChangeLog 2012-09-26 20:45:03 UTC (rev 129698)
@@ -1,3 +1,14 @@
+2012-09-26 Michael Saboff <[email protected]>
+
+ Unreviewed speculative build fix for clang.
+
+ Added explicit static_cast from int64_t to int32_t.
+
+ * platform/text/TextBreakIteratorICU.cpp:
+ (WebCore::uTextLatin1Clone):
+ (WebCore::uTextLatin1Extract):
+ (WebCore::uTextLatin1MapNativeIndexToUTF16):
+
2012-09-26 Sheriff Bot <[email protected]>
Unreviewed, rolling out r129673.
Modified: trunk/Source/WebCore/platform/text/TextBreakIteratorICU.cpp (129697 => 129698)
--- trunk/Source/WebCore/platform/text/TextBreakIteratorICU.cpp 2012-09-26 20:34:51 UTC (rev 129697)
+++ trunk/Source/WebCore/platform/text/TextBreakIteratorICU.cpp 2012-09-26 20:45:03 UTC (rev 129698)
@@ -102,7 +102,7 @@
/* Point at the same position, but with an empty buffer */
result->chunkNativeStart = source->chunkNativeStart;
result->chunkNativeLimit = source->chunkNativeStart;
- result->nativeIndexingLimit = source->chunkNativeStart;
+ result->nativeIndexingLimit = static_cast<int32_t>(source->chunkNativeStart);
result->chunkOffset = 0;
result->context = source->context;
result->a = source->a;
@@ -200,7 +200,7 @@
return 0;
if (destCapacity > 0 && !dest) {
- int32_t trimmedLength = length;
+ int32_t trimmedLength = static_cast<int32_t>(length);
if (trimmedLength > destCapacity)
trimmedLength = destCapacity;
@@ -216,7 +216,7 @@
else
*status = U_BUFFER_OVERFLOW_ERROR;
- return length;
+ return static_cast<int32_t>(length);
}
static int64_t uTextLatin1MapOffsetToNative(const UText* uText)
@@ -228,7 +228,7 @@
{
ASSERT_UNUSED(uText, uText->chunkNativeStart >= nativeIndex);
ASSERT_UNUSED(uText, nativeIndex < uText->chunkNativeLimit);
- return nativeIndex;
+ return static_cast<int32_t>(nativeIndex);
}
static void uTextLatin1Close(UText* uText)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
