diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2010-08-02 06:00:15 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2010-08-02 06:00:15 +0000 |
| commit | ee56c42168f6c4271593f6018c4409b6a5910302 (patch) | |
| tree | cbc97623bf259278835c3cff3695d026a1c48d98 /lib/Transforms | |
| parent | 44c7486c6331cdc726057b35ca57f00b5936e261 (diff) | |
| download | external_llvm-ee56c42168f6c4271593f6018c4409b6a5910302.zip external_llvm-ee56c42168f6c4271593f6018c4409b6a5910302.tar.gz external_llvm-ee56c42168f6c4271593f6018c4409b6a5910302.tar.bz2 | |
Prefix `next' iterator operation with `llvm::'.
Fixes potential ambiguity problems on VS 2010.
Patch by nobled!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110029 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms')
| -rw-r--r-- | lib/Transforms/IPO/GlobalOpt.cpp | 2 | ||||
| -rw-r--r-- | lib/Transforms/Scalar/LoopStrengthReduce.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp index 0edbf43..9ea98ec 100644 --- a/lib/Transforms/IPO/GlobalOpt.cpp +++ b/lib/Transforms/IPO/GlobalOpt.cpp @@ -2078,7 +2078,7 @@ static bool isSimpleEnoughPointerToCommit(Constant *C) { return false; // The first index must be zero. - ConstantInt *CI = dyn_cast<ConstantInt>(*next(CE->op_begin())); + ConstantInt *CI = dyn_cast<ConstantInt>(*llvm::next(CE->op_begin())); if (!CI || !CI->isZero()) return false; // The remaining indices must be compile-time known integers within the diff --git a/lib/Transforms/Scalar/LoopStrengthReduce.cpp b/lib/Transforms/Scalar/LoopStrengthReduce.cpp index 5a1efbe..e3b4e5f 100644 --- a/lib/Transforms/Scalar/LoopStrengthReduce.cpp +++ b/lib/Transforms/Scalar/LoopStrengthReduce.cpp @@ -1083,7 +1083,7 @@ void LSRUse::print(raw_ostream &OS) const { for (SmallVectorImpl<int64_t>::const_iterator I = Offsets.begin(), E = Offsets.end(); I != E; ++I) { OS << *I; - if (next(I) != E) + if (llvm::next(I) != E) OS << ','; } OS << '}'; @@ -1987,7 +1987,7 @@ void LSRInstance::CollectInterestingTypesAndFactors() { for (SmallSetVector<const SCEV *, 4>::const_iterator I = Strides.begin(), E = Strides.end(); I != E; ++I) for (SmallSetVector<const SCEV *, 4>::const_iterator NewStrideIter = - next(I); NewStrideIter != E; ++NewStrideIter) { + llvm::next(I); NewStrideIter != E; ++NewStrideIter) { const SCEV *OldStride = *I; const SCEV *NewStride = *NewStrideIter; @@ -2300,7 +2300,7 @@ void LSRInstance::GenerateReassociations(LSRUse &LU, unsigned LUIdx, SmallVector<const SCEV *, 8> InnerAddOps ( ((const SmallVector<const SCEV *, 8> &)AddOps).begin(), J); InnerAddOps.append - (next(J), ((const SmallVector<const SCEV *, 8> &)AddOps).end()); + (llvm::next(J), ((const SmallVector<const SCEV *, 8> &)AddOps).end()); // Don't leave just a constant behind in a register if the constant could // be folded into an immediate field. |