From 9fe871a80da9ba96e4731649bd197e3b7e820184 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Fri, 17 Sep 2010 10:21:45 +0000 Subject: [PATCH] rename variable, 'Type' seems to be present in the enclosing scope, which confuses gcc v3.4 to no end git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@114174 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Parse/ParseExpr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp index be468d537d..15c3e6ea0e 100644 --- a/lib/Parse/ParseExpr.cpp +++ b/lib/Parse/ParseExpr.cpp @@ -683,15 +683,15 @@ ExprResult Parser::ParseCastExpression(bool isUnaryExpression, if (getLang().ObjC1 && Tok.is(tok::identifier)) { const Token& Next = NextToken(); if (Next.is(tok::colon) || Next.is(tok::r_square)) - if (ParsedType Type = Actions.getTypeName(II, ILoc, getCurScope())) - if (Type.get()->isObjCObjectOrInterfaceType()) { + if (ParsedType Typ = Actions.getTypeName(II, ILoc, getCurScope())) + if (Typ.get()->isObjCObjectOrInterfaceType()) { // Fake up a Declarator to use with ActOnTypeName. DeclSpec DS; DS.SetRangeStart(ILoc); DS.SetRangeEnd(ILoc); const char *PrevSpec = 0; unsigned DiagID; - DS.SetTypeSpecType(TST_typename, ILoc, PrevSpec, DiagID, Type); + DS.SetTypeSpecType(TST_typename, ILoc, PrevSpec, DiagID, Typ); Declarator DeclaratorInfo(DS, Declarator::TypeNameContext); TypeResult Ty = Actions.ActOnTypeName(getCurScope(), -- 2.50.1