From: Simon Hausmann Date: Fri, 8 Feb 2013 08:51:13 +0000 (+0100) Subject: Fix build with Visual Studio X-Git-Tag: upstream/5.2.1~669^2~659^2~284 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea72983d39bf6426e182e7ee97858f534288a487;p=platform%2Fupstream%2Fqtdeclarative.git Fix build with Visual Studio VC gets confused by the VM:: namespace prefix here, but it turns out that it's not necessary in the first place. Change-Id: I626d0d4e1d64e64d28783045a4d8bf320a060aeb Reviewed-by: Lars Knoll --- diff --git a/src/v4/qv4functionobject.cpp b/src/v4/qv4functionobject.cpp index 02f76a7..bba00b8 100644 --- a/src/v4/qv4functionobject.cpp +++ b/src/v4/qv4functionobject.cpp @@ -335,7 +335,7 @@ Value FunctionPrototype::method_bind(ExecutionContext *ctx) return Value::fromObject(f); } -ScriptFunction::ScriptFunction(ExecutionContext *scope, VM::Function *function) +ScriptFunction::ScriptFunction(ExecutionContext *scope, Function *function) : FunctionObject(scope) , function(function) { @@ -382,7 +382,7 @@ ScriptFunction::~ScriptFunction() { } -Value ScriptFunction::call(VM::ExecutionContext *ctx) +Value ScriptFunction::call(ExecutionContext *ctx) { assert(function->code); return function->code(ctx, function->codeData);