aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlisdair Meredith <public@alisdairm.net>2009-07-11 14:32:10 +0000
committerAlisdair Meredith <public@alisdairm.net>2009-07-11 14:32:10 +0000
commit002b91fc1a5ea20658bd0af836bea540eaa51932 (patch)
tree777ddfd378dd7d1f751c12a901cf83ea6ca604ed
parent43d74a5a8e1b6880e6c9813930ce59ab6cadfbf1 (diff)
Fix breakage on Windows, cannot redeclare loop variable i in the immediate scope of loop. Rename variable to j.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@75365 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/AST/DeclCXX.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index 45825e1032..3ffeb57e5b 100644
--- 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;
}