diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-11 15:08:30 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-12 20:44:13 +0100 |
commit | afbf1f74af678af0eda76035133406aa8883408a (patch) | |
tree | 2bc7b93256cad8691baa0079e60ba4cf2d52fa93 /src/qml/jsruntime/qv4runtime_p.h | |
parent | faf13a3aa0c97b7386e44d02f323a9156a733c9f (diff) |
Ported ExecutionEngine::newString and newIdentifier to Heap::String
Avoid the use of Returned<String> for newString and changed the identifier
table to use Heap::String. This required moving some code back into
Heap::String, but that's code that doesn't call back into the GC, so
allocations and therefore future object moves aren't possible.
Change-Id: I1dca3e9c12a9c56f09419af8cc8cba39fe04f720
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4runtime_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4runtime_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4runtime_p.h b/src/qml/jsruntime/qv4runtime_p.h index 24971c695a..6be64aa8ea 100644 --- a/src/qml/jsruntime/qv4runtime_p.h +++ b/src/qml/jsruntime/qv4runtime_p.h @@ -221,12 +221,12 @@ struct Q_QML_PRIVATE_EXPORT RuntimeHelpers { static ReturnedValue toPrimitive(const ValueRef value, int typeHint); static double stringToNumber(const QString &s); - static Returned<String> *stringFromNumber(ExecutionEngine *engine, double number); + static Heap::String *stringFromNumber(ExecutionEngine *engine, double number); static double toNumber(const ValueRef value); static void numberToString(QString *result, double num, int radix = 10); static ReturnedValue toString(ExecutionEngine *engine, const ValueRef value); - static Returned<String> *convertToString(ExecutionEngine *engine, const ValueRef value); + static Heap::String *convertToString(ExecutionEngine *engine, const ValueRef value); static ReturnedValue toObject(ExecutionEngine *engine, const ValueRef value); static Heap::Object *convertToObject(ExecutionEngine *engine, const ValueRef value); |