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/qv4string.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/qml/jsruntime/qv4string.cpp') diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp index bd8a5ffccb..4ae10f6506 100644 --- a/src/qml/jsruntime/qv4string.cpp +++ b/src/qml/jsruntime/qv4string.cpp @@ -122,12 +122,12 @@ void String::destroy(Managed *that) static_cast(that)->d()->~Data(); } -void String::markObjects(Managed *that, ExecutionEngine *e) +void String::markObjects(HeapObject *that, ExecutionEngine *e) { - String *s = static_cast(that); - if (s->d()->largestSubLength) { - s->d()->left->mark(e); - s->d()->right->mark(e); + String::Data *s = static_cast(that); + if (s->largestSubLength) { + s->left->mark(e); + s->right->mark(e); } } -- cgit v1.2.3