diff options
| author | Lars Knoll <[email protected]> | 2015-02-13 15:31:23 +0100 |
|---|---|---|
| committer | Simon Hausmann <[email protected]> | 2015-04-24 15:20:35 +0000 |
| commit | 3e4cf5498b6605b1953cbe1b041bdff10154a0ce (patch) | |
| tree | db705a4eb84b7d51bcd315a839c003ff30e62c34 | |
| parent | 3dd0a2328cde175dbdcbb8af94b5984f7d84796f (diff) | |
Fix definition order of nested inline methods
Avoid compiler warning about using inline methods
that aren't defined yet.
Change-Id: Ic19c91e8d8af0cb8d2280ae7e89f4c0363f0e466
Reviewed-by: Simon Hausmann <[email protected]>
| -rw-r--r-- | src/qml/jsruntime/qv4engine_p.h | 9 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4value_inl_p.h | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h index 84ecc3843f..397430e081 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -387,6 +387,15 @@ void Heap::Base::mark(QV4::ExecutionEngine *engine) engine->pushForGC(this); } +inline void Value::mark(ExecutionEngine *e) +{ + if (!val) + return; + Managed *m = as<Managed>(); + if (m) + m->d()->mark(e); +} + } // namespace QV4 diff --git a/src/qml/jsruntime/qv4value_inl_p.h b/src/qml/jsruntime/qv4value_inl_p.h index 9c6dbadc65..380b17d186 100644 --- a/src/qml/jsruntime/qv4value_inl_p.h +++ b/src/qml/jsruntime/qv4value_inl_p.h @@ -44,16 +44,6 @@ QT_BEGIN_NAMESPACE namespace QV4 { -inline void Value::mark(ExecutionEngine *e) -{ - if (!val) - return; - Managed *m = as<Managed>(); - if (m) - m->mark(e); -} - - inline double Value::toNumber() const { if (isInteger()) |