diff options
| author | David Blaikie <dblaikie@gmail.com> | 2013-02-20 07:39:20 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2013-02-20 07:39:20 +0000 |
| commit | fdf45175a8444c421c03627c139777d1de48e516 (patch) | |
| tree | 07671655669804710cbc435f2ae7e7d2018c0052 | |
| parent | 5f645953555cee528cd1c0d6faa16d9b89ebba48 (diff) | |
Fully qualify llvm::next to avoid ambiguity when building as C++11.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175608 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/LiveInterval.cpp | 2 | ||||
| -rw-r--r-- | lib/CodeGen/TwoAddressInstructionPass.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/CodeGen/LiveInterval.cpp b/lib/CodeGen/LiveInterval.cpp index 68f4b16023..74793bed5e 100644 --- a/lib/CodeGen/LiveInterval.cpp +++ b/lib/CodeGen/LiveInterval.cpp @@ -440,7 +440,7 @@ void LiveInterval::join(LiveInterval &Other, iterator OutIt = begin(); OutIt->valno = NewVNInfo[LHSValNoAssignments[OutIt->valno->id]]; - for (iterator I = next(OutIt), E = end(); I != E; ++I) { + for (iterator I = llvm::next(OutIt), E = end(); I != E; ++I) { VNInfo* nextValNo = NewVNInfo[LHSValNoAssignments[I->valno->id]]; assert(nextValNo != 0 && "Huh?"); diff --git a/lib/CodeGen/TwoAddressInstructionPass.cpp b/lib/CodeGen/TwoAddressInstructionPass.cpp index 0da6662441..99d36071cf 100644 --- a/lib/CodeGen/TwoAddressInstructionPass.cpp +++ b/lib/CodeGen/TwoAddressInstructionPass.cpp @@ -1157,7 +1157,7 @@ tryInstructionTransform(MachineBasicBlock::iterator &mi, Begin = MachineBasicBlock::iterator(NewMIs[0]); if (Begin != MBB->begin()) --Begin; - End = next(MachineBasicBlock::iterator(MI)); + End = llvm::next(MachineBasicBlock::iterator(MI)); for (MachineInstr::const_mop_iterator MOI = MI.operands_begin(), MOE = MI.operands_end(); MOI != MOE; ++MOI) { @@ -1562,7 +1562,8 @@ eliminateRegSequence(MachineBasicBlock::iterator &MBBI) { DEBUG(dbgs() << "Inserted: " << *CopyMI); } - MachineBasicBlock::iterator EndMBBI = next(MachineBasicBlock::iterator(MI)); + MachineBasicBlock::iterator EndMBBI = + llvm::next(MachineBasicBlock::iterator(MI)); if (!DefEmitted) { DEBUG(dbgs() << "Turned: " << *MI << " into an IMPLICIT_DEF"); |