diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-11-29 15:24:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-05 10:08:30 +0100 |
| commit | 41aca0cebf3b49597ad0614e3789bbeff5191ff4 (patch) | |
| tree | 40ba1dd71d39a6dd81888fb3ca112a1703d2d761 /src/qml | |
| parent | 32d05752e00218a40516d43069fca2bee0d9894e (diff) | |
Fix data layout of Managed class
The internal class should really be the first member. The
flags should go away over time.
Change-Id: Id2373a438e2af63a55704819c9dd5569c3895080
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/jsruntime/qv4managed_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index cee0614bab..63972688a7 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -156,7 +156,7 @@ private: protected: Managed(InternalClass *internal) - : _data(0), internalClass(internal) + : internalClass(internal), _data(0) { Q_ASSERT(!internalClass || internalClass->vtable); inUse = 1; extensible = 1; @@ -278,6 +278,9 @@ public: ReturnedValue asReturnedValue() { return Value::fromManaged(this).asReturnedValue(); } + + InternalClass *internalClass; + enum { SimpleArray = 1 }; @@ -299,9 +302,6 @@ public: }; }; -public: - InternalClass *internalClass; - private: friend class MemoryManager; friend struct Identifiers; |