aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4memberdata.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-07-17 15:56:30 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2014-07-22 13:49:21 +0200
commitb3fab495f514a3bd2d335276a022c0f3678f1cc4 (patch)
tree3b6f6e17f4addd94bd95bf3fe3945c5398a05446 /src/qml/jsruntime/qv4memberdata.cpp
parent659e06f3a0c5a72154306c16abfeb177b2572e43 (diff)
Cleanup: Get rid of __data members
These are not needed anymore Change-Id: Ib834aa294e84ca9fbdd5b6850d5bc172e8b54ba1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4memberdata.cpp')
-rw-r--r--src/qml/jsruntime/qv4memberdata.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4memberdata.cpp b/src/qml/jsruntime/qv4memberdata.cpp
index 80b01b8b32..7eca47c3ce 100644
--- a/src/qml/jsruntime/qv4memberdata.cpp
+++ b/src/qml/jsruntime/qv4memberdata.cpp
@@ -58,10 +58,10 @@ void Members::ensureIndex(QV4::ExecutionEngine *e, uint idx)
uint s = size();
if (idx >= s) {
int newAlloc = qMax((uint)4, 2*idx);
- uint alloc = sizeof(MemberData) + (newAlloc)*sizeof(Value);
- MemberData *newMemberData = reinterpret_cast<MemberData *>(e->memoryManager->allocManaged(alloc));
+ uint alloc = sizeof(MemberData::Data) + (newAlloc)*sizeof(Value);
+ MemberData *newMemberData = static_cast<MemberData *>(e->memoryManager->allocManaged(alloc));
if (d())
- memcpy(newMemberData, d(), sizeof(MemberData) + s*sizeof(Value));
+ memcpy(newMemberData, d(), sizeof(MemberData::Data) + s*sizeof(Value));
else
new (newMemberData) MemberData(e->memberDataClass);
newMemberData->d()->size = newAlloc;