[llvm-commits] [llvm] r133416 - /llvm/trunk/lib/CodeGen/TailDuplication.cpp

[Francois Pichet]

Author: fpichet
Date: Mon Jun 20 00:19:37 2011
New Revision: 133416

URL: http://llvm.org/viewvc/llvm-project?rev=133416&view=rev
Log:
Fix MSVC build. next() function already exists in the MSVC headers. This create a overload conflict. Make sure we pick up the llvm one.

Modified:
    llvm/trunk/lib/CodeGen/TailDuplication.cpp

Modified: llvm/trunk/lib/CodeGen/TailDuplication.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/TailDuplication.cpp?rev=133416&r1=133415&r2=133416&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/TailDuplication.cpp (original)
+++ llvm/trunk/lib/CodeGen/TailDuplication.cpp Mon Jun 20 00:19:37 2011
@@ -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;