From 353402344d0bbf20bc0003324ab6e8d7f67ee90d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 11 Nov 2014 17:27:49 +0100 Subject: Replaced more usages of Returned with Heap::T* Change-Id: I451128ee71610bfeb71139c28da89a00a8209ec6 Reviewed-by: Lars Knoll --- src/qml/jsruntime/qv4functionobject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/qml/jsruntime/qv4functionobject.cpp') 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::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(scope, function)->as(); - return scope->d()->engine->memoryManager->alloc(scope, function, createProto)->as(); + return scope->d()->engine->memoryManager->alloc(scope, function)->getPointer()->d(); + return scope->d()->engine->memoryManager->alloc(scope, function, createProto)->getPointer()->d(); } DEFINE_OBJECT_VTABLE(FunctionCtor); -- cgit v1.2.3