[cfe-commits] r114174 - /cfe/trunk/lib/Parse/ParseExpr.cpp

[Gabor Greif]

Author: ggreif
Date: Fri Sep 17 05:21:45 2010
New Revision: 114174

URL: http://llvm.org/viewvc/llvm-project?rev=114174&view=rev
Log:
rename variable, 'Type' seems to be present in
the enclosing scope, which confuses gcc v3.4 to no end

Modified:
    cfe/trunk/lib/Parse/ParseExpr.cpp

Modified: cfe/trunk/lib/Parse/ParseExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExpr.cpp?rev=114174&r1=114173&r2=114174&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseExpr.cpp (original)
+++ cfe/trunk/lib/Parse/ParseExpr.cpp Fri Sep 17 05:21:45 2010
@@ -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(),