diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-26 09:18:38 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-26 09:18:38 (GMT) |
| commit | 27d4a7e457b1e40e7cd19a179d3d932b1618b4fa (patch) | |
| tree | bea1d2f8e821ddf3abd032312b4309c373aa88a4 /src/3rdparty/webkit/JavaScriptCore/assembler | |
| parent | d576d770b9b8251f1b5b4808a84045af33e62dba (diff) | |
| parent | 4e55bb8a761cc3e246c539fc5f7cce103ed4d730 (diff) | |
| download | Qt-27d4a7e457b1e40e7cd19a179d3d932b1618b4fa.zip Qt-27d4a7e457b1e40e7cd19a179d3d932b1618b4fa.tar.gz Qt-27d4a7e457b1e40e7cd19a179d3d932b1618b4fa.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team 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); } |