From 9db062ebdb808625dcec79dc611e7c6f89bd2fd5 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Wed, 20 Feb 2013 07:39:20 +0000 Subject: [PATCH] Fully qualify llvm::next to avoid ambiguity when building as C++11. llvm-svn: 175608 --- llvm/lib/CodeGen/LiveInterval.cpp | 2 +- llvm/lib/CodeGen/TwoAddressInstructionPass.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/llvm/lib/CodeGen/LiveInterval.cpp b/llvm/lib/CodeGen/LiveInterval.cpp index 68f4b16..74793be 100644 --- a/llvm/lib/CodeGen/LiveInterval.cpp +++ b/llvm/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/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp b/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp index 0da6662..99d3607 100644 --- a/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp +++ b/llvm/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"); -- 2.7.4