diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-10-20 10:31:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-20 13:30:26 +0200 |
commit | ce5adc76847edf10dc843f5c93485e393f0ca099 (patch) | |
tree | 26ba0fde1d5a343dba15a5e8be1a78c91e3d6bb4 /src/v8/0007-Fix-warnings.patch | |
parent | 3885a45e48b7fd680b6cb83e2d0d618fd04cf690 (diff) |
Revert "Update V8"
This reverts commit 1c4a5fcab76d1b769a4c0369d40dd0dd7c0e7495
Several of the qtdeclarative tests and examples are dying randomly with messages like this:
>
> #
> # Fatal error in ../3rdparty/v8/src/objects-inl.h, line 2169
> # CHECK(object->IsJSFunction()) failed
> #
>
>
> ==== Stack trace ============================================
>
>
> ==== Details ================================================
>
> ==== Key ============================================
>
> =====================
>
> Aborted (core dumped)
Change-Id: Iebaa2497a6f6ef616ef4c3576c217d2a8a2c1ea5
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/v8/0007-Fix-warnings.patch')
-rw-r--r-- | src/v8/0007-Fix-warnings.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/src/v8/0007-Fix-warnings.patch b/src/v8/0007-Fix-warnings.patch new file mode 100644 index 0000000000..b4e39cc521 --- /dev/null +++ b/src/v8/0007-Fix-warnings.patch @@ -0,0 +1,46 @@ +From 2a5cf85d7fd7912e516138db03e4cda47cc2a1ab Mon Sep 17 00:00:00 2001 +From: Aaron Kennedy <aaron.kennedy@nokia.com> +Date: Fri, 27 May 2011 13:04:15 +1000 +Subject: [PATCH 07/16] Fix warnings + +--- + include/v8.h | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/include/v8.h b/include/v8.h +index 2bc0ed1..99f4b9a 100644 +--- a/include/v8.h ++++ b/include/v8.h +@@ -2416,7 +2416,7 @@ class V8EXPORT Extension { // NOLINT + const char** deps = 0); + virtual ~Extension() { } + virtual v8::Handle<v8::FunctionTemplate> +- GetNativeFunction(v8::Handle<v8::String> name) { ++ GetNativeFunction(v8::Handle<v8::String>) { + return v8::Handle<v8::FunctionTemplate>(); + } + +@@ -3722,13 +3722,13 @@ class Internals { + return *reinterpret_cast<T*>(addr); + } + +- static inline bool CanCastToHeapObject(void* o) { return false; } +- static inline bool CanCastToHeapObject(Context* o) { return true; } +- static inline bool CanCastToHeapObject(String* o) { return true; } +- static inline bool CanCastToHeapObject(Object* o) { return true; } +- static inline bool CanCastToHeapObject(Message* o) { return true; } +- static inline bool CanCastToHeapObject(StackTrace* o) { return true; } +- static inline bool CanCastToHeapObject(StackFrame* o) { return true; } ++ static inline bool CanCastToHeapObject(void*) { return false; } ++ static inline bool CanCastToHeapObject(Context*) { return true; } ++ static inline bool CanCastToHeapObject(String*) { return true; } ++ static inline bool CanCastToHeapObject(Object*) { return true; } ++ static inline bool CanCastToHeapObject(Message*) { return true; } ++ static inline bool CanCastToHeapObject(StackTrace*) { return true; } ++ static inline bool CanCastToHeapObject(StackFrame*) { return true; } + }; + + } // namespace internal +-- +1.7.4.4 + |