aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4object_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2014-11-20 17:46:46 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2014-12-11 08:40:35 +0100
commit254cf16ed4c6007a59a7cd5d64bb621430b3c01d (patch)
tree7330fcef5dbd63ba2809d4e8fd3449a673c327f9 /src/qml/jsruntime/qv4object_p.h
parent7cfc07ae1bf4ccbec109f52195ef824a3ea4dc21 (diff)
Fix Object::arrayData() accessor to return a heap object
Change-Id: Iffc82c2f415251d73bb7446848399b54b16589c9 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4object_p.h')
-rw-r--r--src/qml/jsruntime/qv4object_p.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index 2fd0901d6f..379ff2fde6 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -98,8 +98,7 @@ struct Q_QML_EXPORT Object: Managed {
Heap::MemberData *memberData() { return d()->memberData; }
const Heap::MemberData *memberData() const { return d()->memberData; }
- // ### GC
- ArrayData *arrayData() const { return reinterpret_cast<ArrayData *>(d()->arrayData); }
+ Heap::ArrayData *arrayData() const { return d()->arrayData; }
void setArrayData(ArrayData *a) { d()->arrayData = a->d(); }
const Property *propertyAt(uint index) const { return reinterpret_cast<const Property *>(memberData()->data + index); }