diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-10-22 21:18:11 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-10-22 21:18:11 (GMT) |
| commit | 4d1a9b18b905f21b70608b13f4789dadec6bc181 (patch) | |
| tree | bfa0d9364432b0c4fc55648acc0f99a3a12e42f9 /src/3rdparty/webkit/JavaScriptCore/assembler/MacroAssemblerCodeRef.h | |
| parent | a6a8e2b1918b2037c9d79e59aabf04ef09bee73e (diff) | |
| parent | 6e84a8f0d93f178611a40917fec92648e956fe38 (diff) | |
| download | Qt-4d1a9b18b905f21b70608b13f4789dadec6bc181.zip Qt-4d1a9b18b905f21b70608b13f4789dadec6bc181.tar.gz Qt-4d1a9b18b905f21b70608b13f4789dadec6bc181.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/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); } |