summaryrefslogtreecommitdiffstats
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
commitf6eb60a851f0162e4be6245de257544179d34953 (patch)
tree2291fcf46465ed29f81624b34f90e1fbab964633
parenta32ee1d3f2f244eba0d9a45f2d94d89ec08a7f26 (diff)
downloadbcm5719-llvm-f6eb60a851f0162e4be6245de257544179d34953.tar.gz
bcm5719-llvm-f6eb60a851f0162e4be6245de257544179d34953.zip
Fix breakage on Windows, cannot redeclare loop variable i in the immediate scope of loop. Rename variable to j.
llvm-svn: 75365
-rw-r--r--clang/lib/AST/DeclCXX.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp
index 45825e10324..3ffeb57e5b9 100644
--- a/clang/lib/AST/DeclCXX.cpp
+++ b/clang/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;
}
OpenPOWER on IntegriCloud