diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-01-24 22:55:39 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 11:13:48 +0100 |
| commit | a78a48c5328ea746dfd161599894a4a5b11041bd (patch) | |
| tree | 1e38f4334a8e3efdb5761d862baaa465141bf543 /src/qml/jsruntime/qv4mm.cpp | |
| parent | d96478044ae0dfbcc35113e3941aa79604ba83a0 (diff) | |
Cleanups
Remove SafeValue, it was used to port over to an exact GC. Since
we now have that, we can now safely merge it with QV4::Value
again. Also rename SafeString to StringValue for better naming
consistency.
Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4mm.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4mm.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4mm.cpp b/src/qml/jsruntime/qv4mm.cpp index 0ba0b18cda..7bb41f1eec 100644 --- a/src/qml/jsruntime/qv4mm.cpp +++ b/src/qml/jsruntime/qv4mm.cpp @@ -355,7 +355,7 @@ Managed *MemoryManager::alloc(std::size_t size) void MemoryManager::mark() { - SafeValue *markBase = m_d->engine->jsStackTop; + Value *markBase = m_d->engine->jsStackTop; m_d->engine->markObjects(); @@ -698,8 +698,8 @@ void MemoryManager::collectFromStack() const void MemoryManager::collectFromJSStack() const { - SafeValue *v = engine()->jsStackBase; - SafeValue *top = engine()->jsStackTop; + Value *v = engine()->jsStackBase; + Value *top = engine()->jsStackTop; while (v < top) { Managed *m = v->asManaged(); if (m && m->inUse) |