diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-18 21:22:44 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-20 15:16:39 +0100 |
| commit | e7b66a60584b3fcb1436a7dbe8396b71cb69fe1b (patch) | |
| tree | 4ff62f582408df5e948063c18420f61b262c7334 /src/qml/jsruntime/qv4memberdata.cpp | |
| parent | 74c658bb631fd5bab433b9867ff2e568a56ec082 (diff) | |
Make Managed inherit Value
This completes the first milestone towards being able to move
objects across the GC heap.
Change-Id: I8e6ce90254ea767188a31f0dc85b133534c87eb0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4memberdata.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4memberdata.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4memberdata.cpp b/src/qml/jsruntime/qv4memberdata.cpp index 92ffc391de..d4e196f091 100644 --- a/src/qml/jsruntime/qv4memberdata.cpp +++ b/src/qml/jsruntime/qv4memberdata.cpp @@ -56,7 +56,7 @@ Heap::MemberData *MemberData::reallocate(ExecutionEngine *e, Heap::MemberData *o Scope scope(e); Scoped<MemberData> newMemberData(scope, static_cast<Heap::MemberData *>(e->memoryManager->allocManaged(alloc))); if (old) - memcpy(newMemberData, old, sizeof(Heap::MemberData) + s*sizeof(Value)); + memcpy(newMemberData->d(), old, sizeof(Heap::MemberData) + s*sizeof(Value)); else new (newMemberData->d()) Heap::MemberData(e->memberDataClass); newMemberData->d()->size = newAlloc; |