diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 11:51:17 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 11:51:20 +0200 |
commit | 42f2da5e6b543e698fc4f036c45ebb15078409c8 (patch) | |
tree | 2d688b1a812d8410d4ae85283d5e413957000e11 /src/v8/0007-Fix-warnings.patch | |
parent | e9962cc300a805ce09a02ce0c9ae23ceaf8073bb (diff) | |
parent | 009f3d14045e2e2a6eff8c87a8da9eaa621c5249 (diff) |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/src.pro
Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf
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..26141c8ae8 --- /dev/null +++ b/src/v8/0007-Fix-warnings.patch @@ -0,0 +1,46 @@ +From dac5d9db84cf20564621c679937ca7b9c6a8e880 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/13] Fix warnings + +--- + include/v8.h | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/include/v8.h b/include/v8.h +index 9aba4a8..8891dab 100644 +--- a/include/v8.h ++++ b/include/v8.h +@@ -2415,7 +2415,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>(); + } + +@@ -3721,13 +3721,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.2.3 + |