Title: [94256] trunk/Source/_javascript_Core
- Revision
- 94256
- Author
- oli...@apple.com
- Date
- 2011-08-31 17:28:50 -0700 (Wed, 31 Aug 2011)
Log Message
Fix build.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (94255 => 94256)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-01 00:26:46 UTC (rev 94255)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-01 00:28:50 UTC (rev 94256)
@@ -1,5 +1,13 @@
2011-08-31 Oliver Hunt <oli...@apple.com>
+ Fix build.
+
+ * wtf/CheckedArithmetic.h:
+ (WTF::Checked::Checked):
+ (WTF::Checked::operator=):
+
+2011-08-31 Oliver Hunt <oli...@apple.com>
+
fast/regex/overflow.html asserts in debug builds
https://bugs.webkit.org/show_bug.cgi?id=67326
Modified: trunk/Source/_javascript_Core/wtf/CheckedArithmetic.h (94255 => 94256)
--- trunk/Source/_javascript_Core/wtf/CheckedArithmetic.h 2011-09-01 00:26:46 UTC (rev 94255)
+++ trunk/Source/_javascript_Core/wtf/CheckedArithmetic.h 2011-09-01 00:28:50 UTC (rev 94256)
@@ -446,7 +446,7 @@
{
if (!isInBounds<T>(rhs.m_value))
this->overflowed();
- m_value = rhs.m_value;
+ m_value = static_cast<T>(rhs.m_value);
}
template <typename U, typename V> Checked(const Checked<U, V>& rhs)
@@ -455,7 +455,7 @@
this->overflowed();
if (!isInBounds<T>(rhs.m_value))
this->overflowed();
- m_value = rhs.m_value;
+ m_value = static_cast<T>(rhs.m_value);
}
const Checked& operator=(Checked rhs)
@@ -463,7 +463,7 @@
this->clearOverflow();
if (rhs.hasOverflowed())
this->overflowed();
- m_value = rhs.m_value;
+ m_value = static_cast<T>(rhs.m_value);
return *this;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
