diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/JavaScriptCore/heap/WeakImpl.h | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/heap/WeakImpl.h')
| -rw-r--r-- | Source/JavaScriptCore/heap/WeakImpl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/heap/WeakImpl.h b/Source/JavaScriptCore/heap/WeakImpl.h index 9924923f9..ca93fb286 100644 --- a/Source/JavaScriptCore/heap/WeakImpl.h +++ b/Source/JavaScriptCore/heap/WeakImpl.h @@ -26,7 +26,7 @@ #ifndef WeakImpl_h #define WeakImpl_h -#include "JSValue.h" +#include "JSCJSValue.h" namespace JSC { @@ -107,7 +107,7 @@ inline void* WeakImpl::context() inline WeakImpl* WeakImpl::asWeakImpl(JSValue* slot) { - return reinterpret_cast<WeakImpl*>(reinterpret_cast<char*>(slot) + OBJECT_OFFSETOF(WeakImpl, m_jsValue)); + return reinterpret_cast_ptr<WeakImpl*>(reinterpret_cast_ptr<char*>(slot) + OBJECT_OFFSETOF(WeakImpl, m_jsValue)); } } // namespace JSC |