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 | b44b429549bc4c4f950d56d4f6fa0ba486856cc6 (patch) | |
| tree | 7ab91b372433ad7734a54a59dc91a7e9ff51faf9 /lib/Target/CBackend | |
| parent | 56eb10842f19c43f3970f6f6ba2d8b7dbf4807e9 (diff) | |
| download | external_llvm-b44b429549bc4c4f950d56d4f6fa0ba486856cc6.zip external_llvm-b44b429549bc4c4f950d56d4f6fa0ba486856cc6.tar.gz external_llvm-b44b429549bc4c4f950d56d4f6fa0ba486856cc6.tar.bz2 | |
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/CBackend')
| -rw-r--r-- | lib/Target/CBackend/CBackend.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp index 9e4fe27..a52ca79 100644 --- a/lib/Target/CBackend/CBackend.cpp +++ b/lib/Target/CBackend/CBackend.cpp @@ -2573,7 +2573,7 @@ void CWriter::visitSwitchInst(SwitchInst &SI) { BasicBlock *Succ = cast<BasicBlock>(SI.getOperand(i+1)); printPHICopiesForSuccessor (SI.getParent(), Succ, 2); printBranchToBlock(SI.getParent(), Succ, 2); - if (Function::iterator(Succ) == next(Function::iterator(SI.getParent()))) + if (Function::iterator(Succ) == llvm::next(Function::iterator(SI.getParent()))) Out << " break;\n"; } Out << " }\n"; @@ -2593,7 +2593,7 @@ bool CWriter::isGotoCodeNecessary(BasicBlock *From, BasicBlock *To) { /// FIXME: This should be reenabled, but loop reordering safe!! return true; - if (next(Function::iterator(From)) != Function::iterator(To)) + if (llvm::next(Function::iterator(From)) != Function::iterator(To)) return true; // Not the direct successor, we need a goto. //isa<SwitchInst>(From->getTerminator()) |