aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4managed_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-11-13 12:25:08 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2014-11-21 16:36:29 +0100
commitd6140dbfe8ee700c20c1bb9811b4d15a30a83767 (patch)
tree1a2cad7707934c3c7c083225cb0a16552e428e3d /src/qml/jsruntime/qv4managed_p.h
parentb943d80dd90dec1a8b7802b826ad89e924cead05 (diff)
We should never construct a managed derived type directly anymore
Change-Id: I77e4065429a49bb3409bd1518ce910298d6141ee Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4managed_p.h')
-rw-r--r--src/qml/jsruntime/qv4managed_p.h6
1 files changed, 2 insertions, 4 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 {