commit 9fe871a80da9ba96e4731649bd197e3b7e820184
author Gabor Greif <ggreif@gmail.com> Fri Sep 17 10:21:45 2010 +0000
committer Gabor Greif <ggreif@gmail.com> Fri Sep 17 10:21:45 2010 +0000
tree 27474daa90b5eb8f0818044ff20d18fa3bee256f
parent 0e50ee4b94929ff172099bbd0c1029721ac79bc2

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

diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index be468d5..15c3e6e 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -683,15 +683,15 @@
     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(),