Title: [94954] trunk/Source/_javascript_Core
- Revision
- 94954
- Author
- abe...@webkit.org
- Date
- 2011-09-12 06:33:56 -0700 (Mon, 12 Sep 2011)
Log Message
[Qt] Build fails after r94920 with strict compiler
https://bugs.webkit.org/show_bug.cgi?id=67928
Reviewed by Csaba Osztrogonác.
* wtf/RedBlackTree.h:
(WTF::RedBlackTree::insert): Remove dead variables updateStart and newSubTreeRoot.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (94953 => 94954)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-12 11:09:55 UTC (rev 94953)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-12 13:33:56 UTC (rev 94954)
@@ -1,3 +1,13 @@
+2011-09-12 Andras Becsi <andras.be...@nokia.com>
+
+ [Qt] Build fails after r94920 with strict compiler
+ https://bugs.webkit.org/show_bug.cgi?id=67928
+
+ Reviewed by Csaba Osztrogonác.
+
+ * wtf/RedBlackTree.h:
+ (WTF::RedBlackTree::insert): Remove dead variables updateStart and newSubTreeRoot.
+
2011-09-12 Patrick Gansterer <par...@webkit.org>
Unreviewed build fix after r94871.
Modified: trunk/Source/_javascript_Core/wtf/RedBlackTree.h (94953 => 94954)
--- trunk/Source/_javascript_Core/wtf/RedBlackTree.h 2011-09-12 11:09:55 UTC (rev 94953)
+++ trunk/Source/_javascript_Core/wtf/RedBlackTree.h 2011-09-12 13:33:56 UTC (rev 94954)
@@ -171,9 +171,6 @@
treeInsert(x);
x->setColor(Red);
- // The node from which to start propagating updates upwards.
- Node* updateStart = x->parent();
-
while (x != m_root && x->parent()->color() == Red) {
if (x->parent() == x->parent()->parent()->left()) {
Node* y = x->parent()->parent()->right();
@@ -183,7 +180,6 @@
y->setColor(Black);
x->parent()->parent()->setColor(Red);
x = x->parent()->parent();
- updateStart = x->parent();
} else {
if (x == x->parent()->right()) {
// Case 2
@@ -193,8 +189,7 @@
// Case 3
x->parent()->setColor(Black);
x->parent()->parent()->setColor(Red);
- Node* newSubTreeRoot = rightRotate(x->parent()->parent());
- updateStart = newSubTreeRoot->parent();
+ rightRotate(x->parent()->parent());
}
} else {
// Same as "then" clause with "right" and "left" exchanged.
@@ -205,7 +200,6 @@
y->setColor(Black);
x->parent()->parent()->setColor(Red);
x = x->parent()->parent();
- updateStart = x->parent();
} else {
if (x == x->parent()->left()) {
// Case 2
@@ -215,8 +209,7 @@
// Case 3
x->parent()->setColor(Black);
x->parent()->parent()->setColor(Red);
- Node* newSubTreeRoot = leftRotate(x->parent()->parent());
- updateStart = newSubTreeRoot->parent();
+ leftRotate(x->parent()->parent());
}
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
