diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-12-03 00:50:42 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-12-03 00:50:42 +0000 |
| commit | 7896c9f436a4eda5ec15e882a7505ba482a2fcd0 (patch) | |
| tree | 7ab91b372433ad7734a54a59dc91a7e9ff51faf9 /lib/Target/MSP430/MSP430RegisterInfo.cpp | |
| parent | dd5eb023048d0ac69721eb919d3ef1bbaee2e1ce (diff) | |
| download | llvm-7896c9f436a4eda5ec15e882a7505ba482a2fcd0.tar.gz llvm-7896c9f436a4eda5ec15e882a7505ba482a2fcd0.tar.bz2 llvm-7896c9f436a4eda5ec15e882a7505ba482a2fcd0.tar.xz | |
improve portability to avoid conflicting with std::next in c++'0x.
Patch by Howard Hinnant!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@90365 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/MSP430/MSP430RegisterInfo.cpp')
| -rw-r--r-- | lib/Target/MSP430/MSP430RegisterInfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Target/MSP430/MSP430RegisterInfo.cpp b/lib/Target/MSP430/MSP430RegisterInfo.cpp index 92baad9ac1..717844070f 100644 --- a/lib/Target/MSP430/MSP430RegisterInfo.cpp +++ b/lib/Target/MSP430/MSP430RegisterInfo.cpp @@ -193,10 +193,10 @@ MSP430RegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II, // We need to materialize the offset via add instruction. unsigned DstReg = MI.getOperand(0).getReg(); if (Offset < 0) - BuildMI(MBB, next(II), dl, TII.get(MSP430::SUB16ri), DstReg) + BuildMI(MBB, llvm::next(II), dl, TII.get(MSP430::SUB16ri), DstReg) .addReg(DstReg).addImm(-Offset); else - BuildMI(MBB, next(II), dl, TII.get(MSP430::ADD16ri), DstReg) + BuildMI(MBB, llvm::next(II), dl, TII.get(MSP430::ADD16ri), DstReg) .addReg(DstReg).addImm(Offset); return 0; @@ -251,7 +251,7 @@ void MSP430RegisterInfo::emitPrologue(MachineFunction &MF) const { .addReg(MSP430::SPW); // Mark the FramePtr as live-in in every block except the entry. - for (MachineFunction::iterator I = next(MF.begin()), E = MF.end(); + for (MachineFunction::iterator I = llvm::next(MF.begin()), E = MF.end(); I != E; ++I) I->addLiveIn(MSP430::FPW); |