diff options
| author | Ted Kremenek <kremenek@apple.com> | 2008-03-09 18:32:50 +0000 |
|---|---|---|
| committer | Ted Kremenek <kremenek@apple.com> | 2008-03-09 18:32:50 +0000 |
| commit | d40cdd29d09900bf2749cb8f7cc5a69a1e612ac0 (patch) | |
| tree | f4558aaa048faf34b5f8aa70859205f61030e8c9 /lib/Linker | |
| parent | ed87023e697c2621f9b15f09d62fa32822519c1c (diff) | |
| download | external_llvm-d40cdd29d09900bf2749cb8f7cc5a69a1e612ac0.zip external_llvm-d40cdd29d09900bf2749cb8f7cc5a69a1e612ac0.tar.gz external_llvm-d40cdd29d09900bf2749cb8f7cc5a69a1e612ac0.tar.bz2 | |
Fix some compilation errors on msvc:
- "Redefinition of I" (iterator masks previous definition)
- include missing header file
Patch by Argiris Kirtzidis!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48115 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Linker')
| -rw-r--r-- | lib/Linker/LinkModules.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 5545af6..ad6852d 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -597,9 +597,9 @@ static bool LinkAlias(Module *Dest, const Module *Src, // Globals were already linked, thus we can just query ValueMap for variant // of SAliasee in Dest - std::map<const Value*,Value*>::const_iterator I = ValueMap.find(SAliasee); - assert(I != ValueMap.end() && "Aliasee not linked"); - GlobalValue* DAliasee = cast<GlobalValue>(I->second); + std::map<const Value*,Value*>::const_iterator VMI = ValueMap.find(SAliasee); + assert(VMI != ValueMap.end() && "Aliasee not linked"); + GlobalValue* DAliasee = cast<GlobalValue>(VMI->second); // Try to find something 'similar' to SGA in destination module. if (GlobalAlias *DGA = Dest->getNamedAlias(SGA->getName())) { |