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 | a48f44d9ee15b2d9f696c5de6f3e60dc84639c0f (patch) | |
| tree | 37f783e993984e7b0fdd0a0693a337c59f5d3b04 /llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp | |
| parent | f66b72094a9d537a2ec15e6c4d2871b8f58c9aea (diff) | |
| download | bcm5719-llvm-a48f44d9ee15b2d9f696c5de6f3e60dc84639c0f.tar.gz bcm5719-llvm-a48f44d9ee15b2d9f696c5de6f3e60dc84639c0f.zip | |
improve portability to avoid conflicting with std::next in c++'0x.
Patch by Howard Hinnant!
llvm-svn: 90365
Diffstat (limited to 'llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp b/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp index 37adf37af4c..9f3816a862c 100644 --- a/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp +++ b/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp @@ -528,7 +528,7 @@ Thumb1RegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II, MI.getOperand(i+1).ChangeToImmediate(Mask); } Offset = (Offset - Mask * Scale); - MachineBasicBlock::iterator NII = next(II); + MachineBasicBlock::iterator NII = llvm::next(II); emitThumbRegPlusImmediate(MBB, NII, DestReg, DestReg, Offset, TII, *this, dl); } else { |
