[llvm-commits] [llvm] r48115 - in /llvm/trunk/lib: Linker/LinkModules.cpp Transforms/IPO/ExtractGV.cpp

[Ted Kremenek]

Author: kremenek
Date: Sun Mar  9 13:32:50 2008
New Revision: 48115

URL: http://llvm.org/viewvc/llvm-project?rev=48115&view=rev
Log:
Fix some compilation errors on msvc:
- "Redefinition of I" (iterator masks previous definition)
- include missing header file

Patch by Argiris Kirtzidis!

Modified:
    llvm/trunk/lib/Linker/LinkModules.cpp
    llvm/trunk/lib/Transforms/IPO/ExtractGV.cpp

Modified: llvm/trunk/lib/Linker/LinkModules.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=48115&r1=48114&r2=48115&view=diff

==============================================================================
--- llvm/trunk/lib/Linker/LinkModules.cpp (original)
+++ llvm/trunk/lib/Linker/LinkModules.cpp Sun Mar  9 13:32:50 2008
@@ -597,9 +597,9 @@
 
     // 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())) {

Modified: llvm/trunk/lib/Transforms/IPO/ExtractGV.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ExtractGV.cpp?rev=48115&r1=48114&r2=48115&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/ExtractGV.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/ExtractGV.cpp Sun Mar  9 13:32:50 2008
@@ -17,6 +17,7 @@
 #include "llvm/Constants.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Support/Compiler.h"
+#include <algorithm>
 using namespace llvm;
 
 namespace {