From 289a27946fc11ae6b5a9aa517639d94efa4d91d9 Mon Sep 17 00:00:00 2001 From: Francois Pichet Date: Mon, 20 Jun 2011 05:19:37 +0000 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/CodeGen/TailDuplication.cpp b/lib/CodeGen/TailDuplication.cpp index 1ac552ed525..f93840103e0 100644 --- a/lib/CodeGen/TailDuplication.cpp +++ b/lib/CodeGen/TailDuplication.cpp @@ -635,7 +635,7 @@ TailDuplicatePass::duplicateSimpleBB(MachineBasicBlock *TailBB, << "From simple Succ: " << *TailBB); MachineBasicBlock *NewTarget = *TailBB->succ_begin(); - MachineBasicBlock *NextBB = next(MachineFunction::iterator(PredBB)); + MachineBasicBlock *NextBB = llvm::next(MachineFunction::iterator(PredBB)); DenseMap LocalVRMap; SmallVector, 4> CopyInfos;