diff options
| author | Alp Toker <alp@nuanti.com> | 2014-05-03 03:45:55 +0000 |
|---|---|---|
| committer | Alp Toker <alp@nuanti.com> | 2014-05-03 03:45:55 +0000 |
| commit | b6cc592ea3195d49bee6c59f24a071d18865cb57 (patch) | |
| tree | dbdad383ca4a5eb3c4de70f53e33ae7c62ad6ab3 /clang/lib/Sema/SemaInit.cpp | |
| parent | b7b579aa93346123487e4408084600e7514aa93d (diff) | |
| download | bcm5719-llvm-b6cc592ea3195d49bee6c59f24a071d18865cb57.tar.gz bcm5719-llvm-b6cc592ea3195d49bee6c59f24a071d18865cb57.zip | |
Fix a bunch of mislayered clang/Lex includes from Sema
llvm-svn: 207896
Diffstat (limited to 'clang/lib/Sema/SemaInit.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 68f0cc38301..77bc4d38d27 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -17,7 +17,6 @@ #include "clang/AST/ExprCXX.h" #include "clang/AST/ExprObjC.h" #include "clang/AST/TypeLoc.h" -#include "clang/Lex/Preprocessor.h" #include "clang/Sema/Designator.h" #include "clang/Sema/Lookup.h" #include "clang/Sema/SemaInternal.h" @@ -654,13 +653,13 @@ void InitListChecker::CheckImplicitInitList(const InitializedEntity &Entity, if (T->isArrayType() || T->isRecordType()) { SemaRef.Diag(StructuredSubobjectInitList->getLocStart(), diag::warn_missing_braces) - << StructuredSubobjectInitList->getSourceRange() - << FixItHint::CreateInsertion( - StructuredSubobjectInitList->getLocStart(), "{") - << FixItHint::CreateInsertion( - SemaRef.PP.getLocForEndOfToken( - StructuredSubobjectInitList->getLocEnd()), - "}"); + << StructuredSubobjectInitList->getSourceRange() + << FixItHint::CreateInsertion( + StructuredSubobjectInitList->getLocStart(), "{") + << FixItHint::CreateInsertion( + SemaRef.getLocForEndOfToken( + StructuredSubobjectInitList->getLocEnd()), + "}"); } } } @@ -6513,7 +6512,7 @@ bool InitializationSequence::Diagnose(Sema &S, else R = SourceRange(Args.front()->getLocEnd(), Args.back()->getLocEnd()); - R.setBegin(S.PP.getLocForEndOfToken(R.getBegin())); + R.setBegin(S.getLocForEndOfToken(R.getBegin())); if (Kind.isCStyleOrFunctionalCast()) S.Diag(Kind.getLocation(), diag::err_builtin_func_cast_more_than_one_arg) << R; @@ -7056,10 +7055,10 @@ static void DiagnoseNarrowingInInitList(Sema &S, } OS << ">("; S.Diag(PostInit->getLocStart(), diag::note_init_list_narrowing_override) - << PostInit->getSourceRange() - << FixItHint::CreateInsertion(PostInit->getLocStart(), OS.str()) - << FixItHint::CreateInsertion( - S.getPreprocessor().getLocForEndOfToken(PostInit->getLocEnd()), ")"); + << PostInit->getSourceRange() + << FixItHint::CreateInsertion(PostInit->getLocStart(), OS.str()) + << FixItHint::CreateInsertion( + S.getLocForEndOfToken(PostInit->getLocEnd()), ")"); } //===----------------------------------------------------------------------===// |
