]> granicus.if.org Git - clang/commitdiff
Don't collide loop variable names (to appease GCC)
authorMatt Beaumont-Gay <matthewbg@google.com>
Wed, 30 Nov 2011 19:41:21 +0000 (19:41 +0000)
committerMatt Beaumont-Gay <matthewbg@google.com>
Wed, 30 Nov 2011 19:41:21 +0000 (19:41 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145515 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Frontend/CompilerInstance.cpp

index cb66aadfa99c7bc94c3489134456a2467ced1607..c92d32ac7efd691a7d9ecd0746820f8de03c5ca1 100644 (file)
@@ -1214,17 +1214,17 @@ ModuleKey CompilerInstance::loadModule(SourceLocation ImportLoc,
         llvm::SmallVector<StringRef, 2> Best;
         unsigned BestEditDistance = (std::numeric_limits<unsigned>::max)();
         
-        for (llvm::StringMap<ModuleMap::Module *>::iterator 
-                  I = Module->SubModules.begin(), 
-               IEnd = Module->SubModules.end();
-             I != IEnd; ++I) {
-          unsigned ED = Name.edit_distance(I->getValue()->Name,
+        for (llvm::StringMap<ModuleMap::Module *>::iterator
+                  J = Module->SubModules.begin(), 
+               JEnd = Module->SubModules.end();
+             J != JEnd; ++J) {
+          unsigned ED = Name.edit_distance(J->getValue()->Name,
                                            /*AllowReplacements=*/true,
                                            BestEditDistance);
           if (ED <= BestEditDistance) {
             if (ED < BestEditDistance)
               Best.clear();
-            Best.push_back(I->getValue()->Name);
+            Best.push_back(J->getValue()->Name);
           }
         }
         
@@ -1259,4 +1259,3 @@ ModuleKey CompilerInstance::loadModule(SourceLocation ImportLoc,
   LastModuleImportResult = Module;
   return Module;
 }
-