diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-04-03 13:00:49 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:48:53 +0200 |
| commit | 4427576fe548b6f9f8acba6a5ac3082fbbb99724 (patch) | |
| tree | 309f80779da95f337dd869e1990ffd4f0bb9b724 /src/qml/jsruntime/qv4arraydata.cpp | |
| parent | 08a3c0edeb3cdfa15a9fecdfb4c7c1ab82227437 (diff) | |
| download | qtdeclarative-4427576fe548b6f9f8acba6a5ac3082fbbb99724.tar.gz | |
Avoid calling destroy() on most objects
The method is now optional, and we can simply avoid
calling it if all members an object has are themselves
garbage collected.
Change-Id: If560fce051908bcc10409ead1a7d8a5bd5fa71d2
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4arraydata.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4arraydata.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp index ed2122fb89..0bc97cd571 100644 --- a/src/qml/jsruntime/qv4arraydata.cpp +++ b/src/qml/jsruntime/qv4arraydata.cpp @@ -47,7 +47,7 @@ using namespace QV4; const ArrayVTable SimpleArrayData::static_vtbl = { - DEFINE_MANAGED_VTABLE_INT(SimpleArrayData), + DEFINE_MANAGED_VTABLE_NO_DESTROY_INT(SimpleArrayData), SimpleArrayData::Simple, SimpleArrayData::reallocate, SimpleArrayData::get, @@ -207,10 +207,6 @@ void ArrayData::ensureAttributes(Object *o) } -void SimpleArrayData::destroy(Managed *) -{ -} - void SimpleArrayData::markObjects(Managed *d, ExecutionEngine *e) { SimpleArrayData *dd = static_cast<SimpleArrayData *>(d); |