Fix breakage on Windows, cannot redeclare loop variable i in the immediate scope...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@75365 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index 45825e103240aa3d44dc5915337d6b31daf5a95d..3ffeb57e5b97da040483174c5da12ebcf221779f 100644 (file)
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -108,11 +108,11 @@ CXXRecordDecl::setBases(ASTContext &C,
       const CXXBaseSpecifier *VBase = Bases[i];
       if (!VBase->isVirtual())
         continue;
-      int i;
-      for (i = 0; i < vbaseCount; ++i)
-        if (UniqueVbases[i]->getType() == VBase->getType())
+      int j;
+      for (j = 0; j < vbaseCount; ++j)
+        if (UniqueVbases[j]->getType() == VBase->getType())
           break;
-      if (i == vbaseCount) {
+      if (j == vbaseCount) {
         UniqueVbases.push_back(VBase);
         ++vbaseCount;
       }