diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-06-29 08:55:27 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-06-29 08:55:27 +0200 |
| commit | 1ce7176ba1b39f02ab45056023f8e7622f48cc74 (patch) | |
| tree | b891c603eac63fe4520ff51100a3d822160b719f /compilerplugins/clang/stringconstant.cxx | |
| parent | 6439d93cbe64bacba1bcb858dd7cbb6a33fca60b (diff) | |
Remove support for Clang < 3.3
Change-Id: I185852a738bac10dc6d331afccfcbc7ae1225cb1
Diffstat (limited to 'compilerplugins/clang/stringconstant.cxx')
| -rw-r--r-- | compilerplugins/clang/stringconstant.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compilerplugins/clang/stringconstant.cxx b/compilerplugins/clang/stringconstant.cxx index 157039bcf606..4c9dd86d8f03 100644 --- a/compilerplugins/clang/stringconstant.cxx +++ b/compilerplugins/clang/stringconstant.cxx @@ -62,7 +62,7 @@ bool hasOverloads(FunctionDecl const * decl, unsigned arguments) { ctx = ctx->getParent(); } auto res = ctx->lookup(decl->getDeclName()); - for (auto d = compat::begin(res); d != compat::end(res); ++d) { + for (auto d = res.begin(); d != res.end(); ++d) { FunctionDecl const * f = dyn_cast<FunctionDecl>(*d); if (f != nullptr && f->getMinRequiredArguments() <= arguments && f->getNumParams() >= arguments) @@ -782,7 +782,8 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) { loc = compiler.getSourceManager() .getImmediateMacroCallerLoc(loc); } - if (compat::isMacroBodyExpansion(compiler, loc) + if ((compiler.getSourceManager() + .isMacroBodyExpansion(loc)) && (Lexer::getImmediateMacroName( loc, compiler.getSourceManager(), compiler.getLangOpts()) @@ -1119,7 +1120,7 @@ void StringConstant::reportChange( while (compiler.getSourceManager().isMacroArgExpansion(loc)) { loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc); } - if (compat::isMacroBodyExpansion(compiler, loc)) { + if (compiler.getSourceManager().isMacroBodyExpansion(loc)) { loc = compiler.getSourceManager().getSpellingLoc(loc); } unsigned n = Lexer::MeasureTokenLength( |