diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-23 05:13:34 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-23 05:13:34 (GMT) |
| commit | aab648826f0a11a93341f29e88c46902d5f31e4d (patch) | |
| tree | 11d26e0f7353c66a92c7af23a67bf32782f19332 /src/3rdparty/webkit/JavaScriptCore/assembler | |
| parent | 5de213210ef4f14e698c3fd970cf7e6c5b27c72d (diff) | |
| parent | eeb116b56f9555458438dfe235b16488db9b1494 (diff) | |
| download | Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.zip Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.tar.gz Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/assembler')
| -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); } |