summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/runtime/JSFunction.h
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-11-04 05:34:26 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-11-04 05:34:26 (GMT)
commit0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c (patch)
treee0112b3ddefa71824e45d55f44517904e3c9680c /src/3rdparty/webkit/JavaScriptCore/runtime/JSFunction.h
parenta59291393cc70a1f922e4796efbb72b29920da27 (diff)
parentec502c9e9a26f984023e4f08126e033a504970b2 (diff)
downloadQt-0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c.zip
Qt-0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c.tar.gz
Qt-0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSFunction.h')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/runtime/JSFunction.h8
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*)];
};