6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

Fully qualify llvm::next to avoid ambiguity when building as C++11.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175608 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2013-02-20 07:39:20 +00:00
parent 5f64595355
commit fdf45175a8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CodeGen/LiveInterval.cpp
View File

@ -440,7 +440,7 @@ void LiveInterval::join(LiveInterval &Other,
iterator OutIt = begin(); iterator OutIt = begin();
OutIt->valno = NewVNInfo[LHSValNoAssignments[OutIt->valno->id]]; 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]]; VNInfo* nextValNo = NewVNInfo[LHSValNoAssignments[I->valno->id]];
assert(nextValNo != 0 && "Huh?"); assert(nextValNo != 0 && "Huh?");

5
lib/CodeGen/TwoAddressInstructionPass.cpp
View File

@ -1157,7 +1157,7 @@ tryInstructionTransform(MachineBasicBlock::iterator &mi,
Begin = MachineBasicBlock::iterator(NewMIs[0]); Begin = MachineBasicBlock::iterator(NewMIs[0]);
if (Begin != MBB->begin()) if (Begin != MBB->begin())
--Begin; --Begin;
End = next(MachineBasicBlock::iterator(MI)); End = llvm::next(MachineBasicBlock::iterator(MI));
for (MachineInstr::const_mop_iterator MOI = MI.operands_begin(), for (MachineInstr::const_mop_iterator MOI = MI.operands_begin(),
MOE = MI.operands_end(); MOI != MOE; ++MOI) { MOE = MI.operands_end(); MOI != MOE; ++MOI) {
@ -1562,7 +1562,8 @@ eliminateRegSequence(MachineBasicBlock::iterator &MBBI) {
DEBUG(dbgs() << "Inserted: " << *CopyMI); DEBUG(dbgs() << "Inserted: " << *CopyMI);
} }
MachineBasicBlock::iterator EndMBBI = next(MachineBasicBlock::iterator(MI)); MachineBasicBlock::iterator EndMBBI =
llvm::next(MachineBasicBlock::iterator(MI));
if (!DefEmitted) { if (!DefEmitted) {
DEBUG(dbgs() << "Turned: " << *MI << " into an IMPLICIT_DEF"); DEBUG(dbgs() << "Turned: " << *MI << " into an IMPLICIT_DEF");