From 878b11e0a94e892c0377bca01b49706c150926ed Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sat, 1 Nov 2014 20:56:47 +0100 Subject: Let markObjects() operate directly on HeapObjects This decouples things a bit better and helps moving over to directly store heapobject pointers in other objects. Change-Id: I798f922e018b0a3ca6f8768e4a810187f34d82f6 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4objectiterator.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qml/jsruntime/qv4objectiterator.cpp') diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp index b2875a192d..e0f7087437 100644 --- a/src/qml/jsruntime/qv4objectiterator.cpp +++ b/src/qml/jsruntime/qv4objectiterator.cpp @@ -210,10 +210,10 @@ ReturnedValue ObjectIterator::nextPropertyNameAsString() DEFINE_OBJECT_VTABLE(ForEachIteratorObject); -void ForEachIteratorObject::markObjects(Managed *that, ExecutionEngine *e) +void ForEachIteratorObject::markObjects(HeapObject *that, ExecutionEngine *e) { - ForEachIteratorObject *o = static_cast(that); - o->d()->workArea[0].mark(e); - o->d()->workArea[1].mark(e); + ForEachIteratorObject::Data *o = static_cast(that); + o->workArea[0].mark(e); + o->workArea[1].mark(e); Object::markObjects(that, e); } -- cgit v1.2.3