commit 289a27946fc11ae6b5a9aa517639d94efa4d91d9
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 19d8faf88041d166a94352a702c9083b82437737
parent 275c1f9f93bf71bcf97fe0315bbd9b86dd020177

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133416 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/TailDuplication.cpp

diff --git a/lib/CodeGen/TailDuplication.cpp b/lib/CodeGen/TailDuplication.cpp
index 1ac552e..f938401 100644
--- a/lib/CodeGen/TailDuplication.cpp
+++ b/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;