[llvm-commits] [llvm] r154758 - /llvm/trunk/lib/Target/Hexagon/HexagonCopyToCombine.cpp

[NAKAMURA Takumi]

Author: chapuni
Date: Sun Apr 15 00:09:09 2012
New Revision: 154758

URL: http://llvm.org/viewvc/llvm-project?rev=154758&view=rev
Log:
Target/Hexagon: Tweak to fix msvc build.

Modified:
    llvm/trunk/lib/Target/Hexagon/HexagonCopyToCombine.cpp

Modified: llvm/trunk/lib/Target/Hexagon/HexagonCopyToCombine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonCopyToCombine.cpp?rev=154758&r1=154757&r2=154758&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/HexagonCopyToCombine.cpp (original)
+++ llvm/trunk/lib/Target/Hexagon/HexagonCopyToCombine.cpp Sun Apr 15 00:09:09 2012
@@ -224,7 +224,7 @@
   {
     // Look at instructions I in between I1 and (including) I2.
     MachineBasicBlock::iterator I(I1),
-      End(next(MachineBasicBlock::iterator(I2)));
+      End(llvm::next(MachineBasicBlock::iterator(I2)));
     bool IsImmUseReg = I1->getOperand(1).isImm();
     unsigned I1UseReg = IsImmUseReg ? 0 : I1->getOperand(1).getReg();
     // Track killed operands. If we move accross an instruction that kills our
@@ -317,7 +317,7 @@
 /// false if the combine must be inserted at the returned instruction.
 MachineInstr *HexagonCopyToCombine::findPairable(MachineInstr *I1,
                                                  bool &DoInsertAtI1) {
-  MachineBasicBlock::iterator I2 = next(MachineBasicBlock::iterator(I1));
+  MachineBasicBlock::iterator I2 = llvm::next(MachineBasicBlock::iterator(I1));
   unsigned I1DestReg = I1->getOperand(0).getReg();
 
   for (MachineBasicBlock::iterator End = I1->getParent()->end(); I2 != End;