aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qml/jsruntime/qv4managed_p.h6
-rw-r--r--src/qml/jsruntime/qv4memberdata.cpp2
-rw-r--r--src/qml/jsruntime/qv4memberdata_p.h3
3 files changed, 5 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h
index 5b9668b1c1..ab7580f106 100644
--- a/src/qml/jsruntime/qv4managed_p.h
+++ b/src/qml/jsruntime/qv4managed_p.h
@@ -198,17 +198,15 @@ private:
void *operator new(size_t);
Managed(const Managed &other);
void operator = (const Managed &other);
-
-protected:
Managed(InternalClass *internal)
: data(internal)
{
}
-
-public:
void *operator new(size_t size, MemoryManager *mm);
void *operator new(size_t, Managed *m) { return m; }
+public:
+
inline void mark(QV4::ExecutionEngine *engine);
enum Type {
diff --git a/src/qml/jsruntime/qv4memberdata.cpp b/src/qml/jsruntime/qv4memberdata.cpp
index fe670992d2..50653a0115 100644
--- a/src/qml/jsruntime/qv4memberdata.cpp
+++ b/src/qml/jsruntime/qv4memberdata.cpp
@@ -57,7 +57,7 @@ Heap::MemberData *MemberData::reallocate(ExecutionEngine *e, Heap::MemberData *o
if (old)
memcpy(newMemberData, old, sizeof(Heap::MemberData) + s*sizeof(Value));
else
- new (newMemberData) MemberData(e->memberDataClass);
+ new (newMemberData) Heap::MemberData(e->memberDataClass);
newMemberData->d()->size = newAlloc;
return newMemberData->d();
}
diff --git a/src/qml/jsruntime/qv4memberdata_p.h b/src/qml/jsruntime/qv4memberdata_p.h
index 616d8ee089..c881cf961a 100644
--- a/src/qml/jsruntime/qv4memberdata_p.h
+++ b/src/qml/jsruntime/qv4memberdata_p.h
@@ -43,6 +43,8 @@ namespace QV4 {
namespace Heap {
struct MemberData : Base {
+ MemberData(InternalClass *c)
+ : Base(c), size(0) {}
union {
uint size;
double _dummy;
@@ -56,7 +58,6 @@ struct MemberData : Managed
{
V4_MANAGED(MemberData, Managed)
- MemberData(QV4::InternalClass *ic) : Managed(ic) {}
Value &operator[] (uint idx) { return d()->data[idx]; }
const Value *data() const { return d()->data; }
Value *data() { return d()->data; }