summaryrefslogtreecommitdiffstats
path: root/src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2011-08-30 13:36:52 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-02 14:11:41 +0200
commitf5501c0f3b237a8181820e65f3bfa693475b22b4 (patch)
tree4d0e44eb728412e8b7976179efa4b260688c3329 /src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch
parent7493ee1c44a16dc3b155a5bf3ed7ca966a71072a (diff)
Update our V8
Change-Id: I8925815c068d697999955c45de9f0736ad31ed56 Reviewed-on: http://codereview.qt.nokia.com/3880 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch')
-rw-r--r--src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch b/src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch
new file mode 100644
index 0000000000..bb26b1493f
--- /dev/null
+++ b/src/v8/0014-Fix-build-error-suggest-parentheses-around-within.patch
@@ -0,0 +1,25 @@
+From d7e876decc00c611d327185bf890a7efecb2cf7e Mon Sep 17 00:00:00 2001
+From: Kent Hansen <kent.hansen@nokia.com>
+Date: Mon, 29 Aug 2011 13:26:13 +0200
+Subject: [PATCH 14/16] Fix build error: "suggest parentheses around '&&'
+ within '||'"
+
+---
+ src/mark-compact.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/mark-compact.cc b/src/mark-compact.cc
+index 1b1e361..775f787 100644
+--- a/src/mark-compact.cc
++++ b/src/mark-compact.cc
+@@ -1020,7 +1020,7 @@ class SymbolTableCleaner : public ObjectVisitor {
+ // Since no objects have yet been moved we can safely access the map of
+ // the object.
+ if ((*p)->IsExternalString() ||
+- (*p)->IsHeapObject() && HeapObject::cast(*p)->map()->has_external_resource()) {
++ ((*p)->IsHeapObject() && HeapObject::cast(*p)->map()->has_external_resource())) {
+ heap_->FinalizeExternalString(HeapObject::cast(*p));
+ }
+ // Set the entry to null_value (as deleted).
+--
+1.7.6