diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-08-30 13:36:52 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-02 14:11:41 +0200 |
commit | f5501c0f3b237a8181820e65f3bfa693475b22b4 (patch) | |
tree | 4d0e44eb728412e8b7976179efa4b260688c3329 /src/v8/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch | |
parent | 7493ee1c44a16dc3b155a5bf3ed7ca966a71072a (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/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch')
-rw-r--r-- | src/v8/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/v8/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch b/src/v8/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch new file mode 100644 index 0000000000..003c430f56 --- /dev/null +++ b/src/v8/0015-Fix-source-compatibility-where-the-String-Equals-ove.patch @@ -0,0 +1,25 @@ +From 0af1e15a3d6b28923c262a02a5ace35812c8f5d6 Mon Sep 17 00:00:00 2001 +From: Simon Hausmann <simon.hausmann@nokia.com> +Date: Thu, 4 Aug 2011 21:28:38 +0200 +Subject: [PATCH 15/16] Fix source compatibility where the String::Equals + overloads would shadow the Value::Equals function, + breaking the build. + +--- + include/v8.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/include/v8.h b/include/v8.h +index 4194d4a..5e1ce50 100644 +--- a/include/v8.h ++++ b/include/v8.h +@@ -1048,6 +1048,7 @@ class String : public Primitive { + */ + V8EXPORT bool Equals(uint16_t *string, int length); + V8EXPORT bool Equals(char *string, int length); ++ inline bool Equals(Handle<Value> that) const { return v8::Value::Equals(that); } + + /** + * Write the contents of the string to an external buffer. +-- +1.7.6 |