commit 3f60acade67020e57a61082f6f72bd53a226ef56
author Francois Pichet <pichet2000@gmail.com> Mon Jun 20 05:19:37 2011 +0000
committer Francois Pichet <pichet2000@gmail.com> Mon Jun 20 05:19:37 2011 +0000
tree 8565bdc562e4a3ed443c4fb2cfa77cb01ab574f6
parent ef636bffb5279f5c53de4c8057ddf30b8f94f858

Fix MSVC build. next() function already exists in the MSVC headers. This create a overload conflict. Make sure we pick up the llvm one.

llvm-svn: 133416

llvm/lib/CodeGen/TailDuplication.cpp

diff --git a/llvm/lib/CodeGen/TailDuplication.cpp b/llvm/lib/CodeGen/TailDuplication.cpp
index 1ac552e..f938401 100644
--- a/llvm/lib/CodeGen/TailDuplication.cpp
+++ b/llvm/lib/CodeGen/TailDuplication.cpp
@@ -635,7 +635,7 @@
                  << "From simple Succ: " << *TailBB);
 
     MachineBasicBlock *NewTarget = *TailBB->succ_begin();
-    MachineBasicBlock *NextBB = next(MachineFunction::iterator(PredBB));
+    MachineBasicBlock *NextBB = llvm::next(MachineFunction::iterator(PredBB));
 
     DenseMap<unsigned, unsigned> LocalVRMap;
     SmallVector<std::pair<unsigned,unsigned>, 4> CopyInfos;