diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-11 17:27:49 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-14 13:00:51 +0100 |
| commit | 353402344d0bbf20bc0003324ab6e8d7f67ee90d (patch) | |
| tree | 2ca98c94c37ed26cd9b94c03a92913f0bafac840 /src/qml/jsruntime/qv4functionobject.cpp | |
| parent | afbf1f74af678af0eda76035133406aa8883408a (diff) | |
Replaced more usages of Returned<T> with Heap::T*
Change-Id: I451128ee71610bfeb71139c28da89a00a8209ec6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 79f179760d..b6e766e568 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -183,14 +183,14 @@ void FunctionObject::markObjects(Heap::Base *that, ExecutionEngine *e) Object::markObjects(that, e); } -Returned<FunctionObject> *FunctionObject::createScriptFunction(ExecutionContext *scope, Function *function, bool createProto) +Heap::FunctionObject *FunctionObject::createScriptFunction(ExecutionContext *scope, Function *function, bool createProto) { if (function->needsActivation() || function->compiledFunction->flags & CompiledData::Function::HasCatchOrWith || function->compiledFunction->nFormals > QV4::Global::ReservedArgumentCount || function->isNamedExpression()) - return scope->d()->engine->memoryManager->alloc<ScriptFunction>(scope, function)->as<FunctionObject>(); - return scope->d()->engine->memoryManager->alloc<SimpleScriptFunction>(scope, function, createProto)->as<FunctionObject>(); + return scope->d()->engine->memoryManager->alloc<ScriptFunction>(scope, function)->getPointer()->d(); + return scope->d()->engine->memoryManager->alloc<SimpleScriptFunction>(scope, function, createProto)->getPointer()->d(); } DEFINE_OBJECT_VTABLE(FunctionCtor); |