diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-06-13 16:19:25 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:20 +0200 |
commit | 3110273d1cbb47cb28a4ea96e34373cc7bbdbaa9 (patch) | |
tree | 7c75bc1f0aed6ea52071a6fcffda34c9b59f281d /src/qml/jsruntime/qv4arraydata.cpp | |
parent | da9d5016613d04f002c6433e2b3083143fec34cb (diff) |
Ported array data to the new object structure
Change-Id: Ice53925f42924c889d265bcd1e4af7b9bd356fa8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4arraydata.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4arraydata.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp index 2d702aed97..cbfb0d9f00 100644 --- a/src/qml/jsruntime/qv4arraydata.cpp +++ b/src/qml/jsruntime/qv4arraydata.cpp @@ -117,7 +117,7 @@ void ArrayData::realloc(Object *o, Type newType, uint offset, uint alloc, bool e if (newType < Sparse) { size += sizeof(SimpleArrayData); SimpleArrayData *newData = static_cast<SimpleArrayData *>(o->engine()->memoryManager->allocManaged(size)); - new (newData) SimpleArrayData(o->engine()); + new (newData->d()) SimpleArrayData::Data(o->engine()); newData->setAlloc(alloc - offset); newData->setType(newType); newData->setArrayData(reinterpret_cast<Value *>(newData + 1) + offset); @@ -128,7 +128,7 @@ void ArrayData::realloc(Object *o, Type newType, uint offset, uint alloc, bool e } else { size += sizeof(SparseArrayData); SparseArrayData *newData = static_cast<SparseArrayData *>(o->engine()->memoryManager->allocManaged(size)); - new (newData) SparseArrayData(o->engine()); + new (newData->d()) SparseArrayData::Data(o->engine()); newData->setAlloc(alloc); newData->setType(newType); newData->setArrayData(reinterpret_cast<Value *>(newData + 1)); |