diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-27 10:58:56 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-27 10:58:56 +0100 |
| commit | 9df70b0304fa44d2f1b1504d7e58d718eab4343a (patch) | |
| tree | 95a7b207a39c2b44bd4e80bcc1ea3d36bedd9a99 /src/qml/jsruntime/qv4managed_p.h | |
| parent | 648d4ae6a3591e916f175e32c12a2ea4f8edb6a9 (diff) | |
| parent | 900e3d4ad5f2bc4994ddf164c15c641f85630b81 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: I10d4f9e993d23750a6e8ddc1291b79e47fc83c64
Diffstat (limited to 'src/qml/jsruntime/qv4managed_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4managed_p.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index b4469c8048..47ac5e05e4 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -81,7 +81,7 @@ struct ManagedVTable { ReturnedValue (*call)(Managed *, CallData *data); ReturnedValue (*construct)(Managed *, CallData *data); - void (*markObjects)(Managed *); + void (*markObjects)(Managed *, ExecutionEngine *e); void (*destroy)(Managed *); void (*collectDeletables)(Managed *, GCDeletable **deletable); bool (*hasInstance)(Managed *, const ValueRef value); @@ -166,13 +166,7 @@ public: void operator delete(void *ptr); void operator delete(void *ptr, MemoryManager *mm); - inline void mark() { - if (markBit) - return; - markBit = 1; - if (vtbl->markObjects) - vtbl->markObjects(this); - } + inline void mark(QV4::ExecutionEngine *engine); enum Type { Type_Invalid, |