diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-10-23 11:18:42 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-10-23 11:18:42 (GMT) |
| commit | 97d28c26ba981332f51ab81024bb8b0224afeb81 (patch) | |
| tree | 9c03fd067695043b3a061ad192b6f45e2cf6ecba /src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerCodeRef.h | |
| parent | d48c3129992bf4b962201fa908f37f0e2a61f7c4 (diff) | |
| parent | 180d9189e8098d98848367f673fff723ddd1d068 (diff) | |
| download | Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.zip Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.tar.gz Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerCodeRef.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerCodeRef.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerCodeRef.h b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerCodeRef.h index 568260a..3681af8 100644 --- a/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerCodeRef.h +++ b/src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerCodeRef.h @@ -69,7 +69,13 @@ public: template<typename FunctionType> explicit FunctionPtr(FunctionType* value) +#if COMPILER(RVCT) + // RVTC compiler needs C-style cast as it fails with the following error + // Error: #694: reinterpret_cast cannot cast away const or other type qualifiers + : m_value((void*)(value)) +#else : m_value(reinterpret_cast<void*>(value)) +#endif { ASSERT_VALID_CODE_POINTER(m_value); } |