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/WeakBlock.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/WeakBlock.h')
| -rw-r--r-- | Source/JavaScriptCore/heap/WeakBlock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/heap/WeakBlock.h b/Source/JavaScriptCore/heap/WeakBlock.h index fd28101fd..b6b631e27 100644 --- a/Source/JavaScriptCore/heap/WeakBlock.h +++ b/Source/JavaScriptCore/heap/WeakBlock.h @@ -97,7 +97,7 @@ inline bool WeakBlock::SweepResult::isNull() const inline WeakImpl* WeakBlock::asWeakImpl(FreeCell* freeCell) { - return reinterpret_cast<WeakImpl*>(freeCell); + return reinterpret_cast_ptr<WeakImpl*>(freeCell); } inline WeakBlock::SweepResult WeakBlock::takeSweepResult() @@ -110,12 +110,12 @@ inline WeakBlock::SweepResult WeakBlock::takeSweepResult() inline WeakBlock::FreeCell* WeakBlock::asFreeCell(WeakImpl* weakImpl) { - return reinterpret_cast<FreeCell*>(weakImpl); + return reinterpret_cast_ptr<FreeCell*>(weakImpl); } inline WeakImpl* WeakBlock::weakImpls() { - return reinterpret_cast<WeakImpl*>(this) + ((sizeof(WeakBlock) + sizeof(WeakImpl) - 1) / sizeof(WeakImpl)); + return reinterpret_cast_ptr<WeakImpl*>(this) + ((sizeof(WeakBlock) + sizeof(WeakImpl) - 1) / sizeof(WeakImpl)); } inline size_t WeakBlock::weakImplCount() |