Title: [104620] trunk/Source/_javascript_Core
- Revision
- 104620
- Author
- [email protected]
- Date
- 2012-01-10 13:01:01 -0800 (Tue, 10 Jan 2012)
Log Message
Build fix following https://bugs.webkit.org/show_bug.cgi?id=75935
Fix 32-bit builds.
* runtime/JSArray.cpp:
(JSC::JSArray::getOwnPropertyNames):
(JSC::JSArray::setLength):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (104619 => 104620)
--- trunk/Source/_javascript_Core/ChangeLog 2012-01-10 20:43:20 UTC (rev 104619)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-01-10 21:01:01 UTC (rev 104620)
@@ -1,5 +1,15 @@
2012-01-10 Gavin Barraclough <[email protected]>
+ Build fix following https://bugs.webkit.org/show_bug.cgi?id=75935
+
+ Fix 32-bit builds.
+
+ * runtime/JSArray.cpp:
+ (JSC::JSArray::getOwnPropertyNames):
+ (JSC::JSArray::setLength):
+
+2012-01-10 Gavin Barraclough <[email protected]>
+
Windows build fix.
* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
Modified: trunk/Source/_javascript_Core/runtime/JSArray.cpp (104619 => 104620)
--- trunk/Source/_javascript_Core/runtime/JSArray.cpp 2012-01-10 20:43:20 UTC (rev 104619)
+++ trunk/Source/_javascript_Core/runtime/JSArray.cpp 2012-01-10 21:01:01 UTC (rev 104620)
@@ -899,7 +899,7 @@
SparseArrayValueMap::const_iterator end = map->end();
for (SparseArrayValueMap::const_iterator it = map->begin(); it != end; ++it) {
if (mode == IncludeDontEnumProperties || !(it->second.attributes & DontEnum))
- keys.append(it->first);
+ keys.append(static_cast<unsigned>(it->first));
}
qsort(keys.begin(), keys.size(), sizeof(unsigned), compareKeysForQSort);
@@ -1114,7 +1114,7 @@
keys.reserveCapacity(min(map->size(), static_cast<size_t>(length - newLength)));
SparseArrayValueMap::const_iterator end = map->end();
for (SparseArrayValueMap::const_iterator it = map->begin(); it != end; ++it) {
- unsigned index = it->first;
+ unsigned index = static_cast<unsigned>(it->first);
if (index < length && index >= newLength)
keys.append(index);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
