diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-09 16:14:20 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-09 16:14:20 (GMT) |
commit | a8e0e5656f09130e68c10209429a0870b38248c4 (patch) | |
tree | 9f2c51be485c3f1e4afea821ebbe838a08c0ce2d /src/3rdparty/webkit/JavaScriptCore/runtime/JSFunction.h | |
parent | 8fbdbd25015a4e5544dace3a77427861f0ca89f4 (diff) | |
parent | b770abdd564f28a8d9dde816f72f73e6b15984af (diff) | |
download | Qt-a8e0e5656f09130e68c10209429a0870b38248c4.zip Qt-a8e0e5656f09130e68c10209429a0870b38248c4.tar.gz Qt-a8e0e5656f09130e68c10209429a0870b38248c4.tar.bz2 |
Merge branch '4.6' into core-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*)]; }; |