diff options
Diffstat (limited to 'clang')
-rw-r--r-- | clang/include/clang/Sema/SemaFixItUtils.h | 2 | ||||
-rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 5 | ||||
-rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/clang/include/clang/Sema/SemaFixItUtils.h b/clang/include/clang/Sema/SemaFixItUtils.h index 0c1bba5078f..fffca679145 100644 --- a/clang/include/clang/Sema/SemaFixItUtils.h +++ b/clang/include/clang/Sema/SemaFixItUtils.h @@ -39,7 +39,7 @@ struct ConversionFixItGenerator { ExprValueKind FromVK); /// The list of Hints generated so far. - SmallVector<FixItHint, 1> Hints; + std::vector<FixItHint> Hints; /// The number of Conversions fixed. This can be different from the size /// of the Hints vector since we allow multiple FixIts per conversion. diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 15f56e840c5..75caa6f5855 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -9212,9 +9212,8 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy, // If we can fix the conversion, suggest the FixIts. assert(ConvHints.isNull() || Hint.isNull()); if (!ConvHints.isNull()) { - for (llvm::SmallVector<FixItHint, 1>::iterator - HI = ConvHints.Hints.begin(), HE = ConvHints.Hints.end(); - HI != HE; ++HI) + for (std::vector<FixItHint>::iterator HI = ConvHints.Hints.begin(), + HE = ConvHints.Hints.end(); HI != HE; ++HI) FDiag << *HI; } else { FDiag << Hint; diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index 5044f1c1df2..8281597e29e 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -7477,9 +7477,8 @@ void DiagnoseBadConversion(Sema &S, OverloadCandidate *Cand, unsigned I) { << (unsigned) (Cand->Fix.Kind); // If we can fix the conversion, suggest the FixIts. - for (SmallVector<FixItHint, 1>::iterator - HI = Cand->Fix.Hints.begin(), HE = Cand->Fix.Hints.end(); - HI != HE; ++HI) + for (std::vector<FixItHint>::iterator HI = Cand->Fix.Hints.begin(), + HE = Cand->Fix.Hints.end(); HI != HE; ++HI) FDiag << *HI; S.Diag(Fn->getLocation(), FDiag); |