Title: [147627] tags/Safari-537.35.8/Source/_javascript_Core
- Revision
- 147627
- Author
- [email protected]
- Date
- 2013-04-04 08:14:42 -0700 (Thu, 04 Apr 2013)
Log Message
Merged r147079. <rdar://problem/13519289>
Modified Paths
Diff
Modified: tags/Safari-537.35.8/Source/_javascript_Core/ChangeLog (147626 => 147627)
--- tags/Safari-537.35.8/Source/_javascript_Core/ChangeLog 2013-04-04 15:12:49 UTC (rev 147626)
+++ tags/Safari-537.35.8/Source/_javascript_Core/ChangeLog 2013-04-04 15:14:42 UTC (rev 147627)
@@ -1,5 +1,17 @@
2013-04-04 Lucas Forschler <[email protected]>
+ Merge r147079
+
+ 2013-03-28 Zan Dobersek <[email protected]>
+
+ Unreviewed build fix for the EFL and GTK ports.
+
+ * runtime/CodeCache.cpp:
+ (JSC::CodeCacheMap::pruneSlowCase): Pass a 0 casted to the int64_t type instead of 0LL
+ to the std::max call so the arguments' types match.
+
+2013-04-04 Lucas Forschler <[email protected]>
+
Merge r147017
2013-03-27 Mark Hahnenberg <[email protected]>
Modified: tags/Safari-537.35.8/Source/_javascript_Core/runtime/CodeCache.cpp (147626 => 147627)
--- tags/Safari-537.35.8/Source/_javascript_Core/runtime/CodeCache.cpp 2013-04-04 15:12:49 UTC (rev 147626)
+++ tags/Safari-537.35.8/Source/_javascript_Core/runtime/CodeCache.cpp 2013-04-04 15:14:42 UTC (rev 147627)
@@ -40,7 +40,7 @@
void CodeCacheMap::pruneSlowCase()
{
- m_minCapacity = std::max(m_size - m_sizeAtLastPrune, 0LL);
+ m_minCapacity = std::max(m_size - m_sizeAtLastPrune, static_cast<int64_t>(0));
m_sizeAtLastPrune = m_size;
m_timeAtLastPrune = monotonicallyIncreasingTime();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
