<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Applied!<div><br class="webkit-block-placeholder"></div><div><a href="http://llvm.org/viewvc/llvm-project?rev=48115&view=rev">http://llvm.org/viewvc/llvm-project?rev=48115&view=rev</a></div><div><br></div><div>Thanks!</div><div><br><div><div>On Mar 9, 2008, at 11:21 AM, Argiris Kirtzidis wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite">Hi,<br><br>The attached patch fixes a couple of compiler errors on msvc:<br><br>- std::map<const Value*,Value*>::const_iterator I = ValueMap.find(SAliasee);<br>+ std::map<const Value*,Value*>::const_iterator VMI = ValueMap.find(SAliasee);<br><br>error: redefinition of 'I'<br><br>+#include <algorithm><br>so that std::find is usable.<br><br><span><msvc-fix.zip></span>Index: lib/Linker/LinkModules.cpp<br>===================================================================<br>--- lib/Linker/LinkModules.cpp<span class="Apple-tab-span" style="white-space:pre"> </span>(revision 48113)<br>+++ lib/Linker/LinkModules.cpp<span class="Apple-tab-span" style="white-space:pre"> </span>(working copy)<br>@@ -597,9 +597,9 @@<br><br> // Globals were already linked, thus we can just query ValueMap for variant<br> // of SAliasee in Dest<br>- std::map<const Value*,Value*>::const_iterator I = ValueMap.find(SAliasee);<br>- assert(I != ValueMap.end() && "Aliasee not linked");<br>- GlobalValue* DAliasee = cast<GlobalValue>(I->second);<br>+ std::map<const Value*,Value*>::const_iterator VMI = ValueMap.find(SAliasee);<br>+ assert(VMI != ValueMap.end() && "Aliasee not linked");<br>+ GlobalValue* DAliasee = cast<GlobalValue>(VMI->second);<br><br> // Try to find something 'similar' to SGA in destination module.<br> if (GlobalAlias *DGA = Dest->getNamedAlias(SGA->getName())) {<br>Index: lib/Transforms/IPO/ExtractGV.cpp<br>===================================================================<br>--- lib/Transforms/IPO/ExtractGV.cpp<span class="Apple-tab-span" style="white-space:pre"> </span>(revision 48113)<br>+++ lib/Transforms/IPO/ExtractGV.cpp<span class="Apple-tab-span" style="white-space:pre"> </span>(working copy)<br>@@ -17,6 +17,7 @@<br> #include "llvm/Constants.h"<br> #include "llvm/Transforms/IPO.h"<br> #include "llvm/Support/Compiler.h"<br>+#include <algorithm><br> using namespace llvm;<br><br> namespace {<br>_______________________________________________<br>LLVMbugs mailing list<br><a href="mailto:LLVMbugs@cs.uiuc.edu">LLVMbugs@cs.uiuc.edu</a><br>http://lists.cs.uiuc.edu/mailman/listinfo/llvmbugs<br></blockquote></div><br></div></body></html>