diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-01-08 12:00:00 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-04-12 13:58:58 +0000 |
commit | 30850d1ebc28bfe68b329229b537a7d6a7791b29 (patch) | |
tree | 1c94b8a81bd1755adf42c077c8912acb25f121e1 /src/qml/memory/qv4heap_p.h | |
parent | b6bb3fe4238c93d865e255c4681f07b9d4175529 (diff) |
Remove dependency from qv4heap_p.h onto qv4internalclass_p.h
This is required to be able to turn the internal class into
something that lives on the GC heap.
Change-Id: Ie4318588d420743b1e1ab1cd596a1c9d153eb793
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/memory/qv4heap_p.h')
-rw-r--r-- | src/qml/memory/qv4heap_p.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/qml/memory/qv4heap_p.h b/src/qml/memory/qv4heap_p.h index 403f400bee..1ca37fe95f 100644 --- a/src/qml/memory/qv4heap_p.h +++ b/src/qml/memory/qv4heap_p.h @@ -54,7 +54,6 @@ #include <private/qv4global_p.h> #include <private/qv4mmdefs_p.h> #include <private/qv4writebarrier_p.h> -#include <private/qv4internalclass_p.h> #include <QSharedPointer> // To check if Heap::Base::init is called (meaning, all subclasses did their init and called their @@ -121,7 +120,6 @@ struct Q_QML_EXPORT Base { inline ReturnedValue asReturnedValue() const; inline void mark(QV4::MarkStack *markStack); - inline const VTable *vtable() const; inline bool isMarked() const { const HeapItem *h = reinterpret_cast<const HeapItem *>(this); Chunk *c = h->chunk(); @@ -148,10 +146,6 @@ struct Q_QML_EXPORT Base { return Chunk::testBit(c->objectBitmap, h - c->realBase()); } - inline void markChildren(MarkStack *markStack) { - vtable()->markObjects(this, markStack); - } - void *operator new(size_t, Managed *m) { return m; } void *operator new(size_t, Base *m) { return m; } void operator delete(void *, Base *) {} @@ -218,12 +212,6 @@ void Base::mark(QV4::MarkStack *markStack) } } -inline -const VTable *Base::vtable() const -{ - return internalClass->vtable; -} - template<typename T, size_t o> Base *Pointer<T, o>::base() { Base *base = reinterpret_cast<Base *>(this) - (offset/sizeof(Base *)); |