diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-04 06:29:46 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-04 06:29:46 (GMT) |
| commit | 1400ce5b85fbe7c67899f5f62bfd276eecb21ae0 (patch) | |
| tree | ccc72723d2305b4d24f9ec296e6d9ee7d3d9d16a /src/3rdparty/webkit/JavaScriptCore/runtime/JSFunction.h | |
| parent | 867be3fd7a2017377e8ae5cc3ab789b3b01733bd (diff) | |
| parent | be71186962db5974113e89b0e7c7aa1ab3987379 (diff) | |
| download | Qt-1400ce5b85fbe7c67899f5f62bfd276eecb21ae0.zip Qt-1400ce5b85fbe7c67899f5f62bfd276eecb21ae0.tar.gz Qt-1400ce5b85fbe7c67899f5f62bfd276eecb21ae0.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/runtime/JSFunction.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSFunction.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSFunction.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSFunction.h index b4356c4..fcac9aa 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSFunction.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSFunction.h @@ -66,7 +66,7 @@ namespace JSC { NativeFunction nativeFunction() { - return *reinterpret_cast<NativeFunction*>(m_data); + return *WTF::bitwise_cast<NativeFunction*>(m_data); } virtual ConstructType getConstructData(ConstructData&); @@ -97,7 +97,7 @@ namespace JSC { ScopeChain& scopeChain() { ASSERT(!isHostFunctionNonInline()); - return *reinterpret_cast<ScopeChain*>(m_data); + return *WTF::bitwise_cast<ScopeChain*>(m_data); } void clearScopeChain() { @@ -112,11 +112,11 @@ namespace JSC { void setScopeChain(const ScopeChain& sc) { ASSERT(!isHostFunctionNonInline()); - *reinterpret_cast<ScopeChain*>(m_data) = sc; + *WTF::bitwise_cast<ScopeChain*>(m_data) = sc; } void setNativeFunction(NativeFunction func) { - *reinterpret_cast<NativeFunction*>(m_data) = func; + *WTF::bitwise_cast<NativeFunction*>(m_data) = func; } unsigned char m_data[sizeof(void*)]; }; |