From 0e1d8b6b89a390c81ff815c82f268159efc41544 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Thu, 31 Jan 2013 10:58:01 +0100 Subject: [PATCH] Fix compilation on Mac with clang. Change-Id: Ib5ecd92a0b7209ed505d17620ba4097e8d54a53c Reviewed-by: Simon Hausmann --- src/v4/qv4codegen.cpp | 3 ++- tools/v4/v4.pro | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/v4/qv4codegen.cpp b/src/v4/qv4codegen.cpp index 4c4f7dd..241b3e8 100644 --- a/src/v4/qv4codegen.cpp +++ b/src/v4/qv4codegen.cpp @@ -1872,7 +1872,8 @@ IR::Function *Codegen::defineFunction(const QString &name, AST::Node *ast, foreach (const QString &inheritedLocal, inheritedLocals) { function->LOCAL(inheritedLocal); unsigned tempIndex = entryBlock->newTemp(); - Environment::Member member = { Environment::UndefinedMember, tempIndex, 0 }; + Environment::Member member = { Environment::UndefinedMember, + static_cast(tempIndex), 0 }; _env->members.insert(inheritedLocal, member); } } diff --git a/tools/v4/v4.pro b/tools/v4/v4.pro index db18753..56d6b83 100644 --- a/tools/v4/v4.pro +++ b/tools/v4/v4.pro @@ -13,6 +13,6 @@ INCLUDEPATH += ../../src/3rdparty/masm/disassembler DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE="" DEFINES += QMLJS_NO_LLVM -DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 +DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0 ENABLE_LLINT=0 load(qt_tool) -- 2.7.4