diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-17 15:56:30 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:21 +0200 |
commit | b3fab495f514a3bd2d335276a022c0f3678f1cc4 (patch) | |
tree | 3b6f6e17f4addd94bd95bf3fe3945c5398a05446 /src/qml/jsruntime/qv4arraydata.cpp | |
parent | 659e06f3a0c5a72154306c16abfeb177b2572e43 (diff) |
Cleanup: Get rid of __data members
These are not needed anymore
Change-Id: Ib834aa294e84ca9fbdd5b6850d5bc172e8b54ba1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4arraydata.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4arraydata.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp index cd0925092e..f56c31b177 100644 --- a/src/qml/jsruntime/qv4arraydata.cpp +++ b/src/qml/jsruntime/qv4arraydata.cpp @@ -131,23 +131,23 @@ void ArrayData::realloc(Object *o, Type newType, uint offset, uint alloc, bool e size += alloc*sizeof(PropertyAttributes); if (newType < Sparse) { - size += sizeof(SimpleArrayData); + size += sizeof(SimpleArrayData::Data); SimpleArrayData *newData = static_cast<SimpleArrayData *>(o->engine()->memoryManager->allocManaged(size)); new (newData->d()) SimpleArrayData::Data(o->engine()); newData->setAlloc(alloc - offset); newData->setType(newType); - newData->setArrayData(reinterpret_cast<Value *>(newData + 1) + offset); + newData->setArrayData(reinterpret_cast<Value *>(newData->d() + 1) + offset); newData->setAttrs(enforceAttributes ? reinterpret_cast<PropertyAttributes *>(newData->arrayData() + alloc) + offset : 0); newData->offset() = offset; newData->len() = d ? static_cast<SimpleArrayData *>(d)->len() : 0; o->setArrayData(newData); } else { - size += sizeof(SparseArrayData); + size += sizeof(SparseArrayData::Data); SparseArrayData *newData = static_cast<SparseArrayData *>(o->engine()->memoryManager->allocManaged(size)); new (newData->d()) SparseArrayData::Data(o->engine()); newData->setAlloc(alloc); newData->setType(newType); - newData->setArrayData(reinterpret_cast<Value *>(newData + 1)); + newData->setArrayData(reinterpret_cast<Value *>(newData->d() + 1)); newData->setAttrs(enforceAttributes ? reinterpret_cast<PropertyAttributes *>(newData->arrayData() + alloc) : 0); o->setArrayData(newData); } |