diff options
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/clang/compat.hxx | 20 | ||||
| -rw-r--r-- | compilerplugins/clang/salbool.cxx | 6 |
2 files changed, 24 insertions, 2 deletions
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx index 7389f636d0bf..5533e8f2890e 100644 --- a/compilerplugins/clang/compat.hxx +++ b/compilerplugins/clang/compat.hxx @@ -160,6 +160,26 @@ inline std::unique_ptr<llvm::raw_fd_ostream> create_raw_fd_ostream( #endif } +inline clang::NamedDecl * const * begin( + clang::DeclContextLookupConstResult const & result) +{ +#if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3 + return result.begin(); +#else + return result.first; +#endif +} + +inline clang::NamedDecl * const * end( + clang::DeclContextLookupConstResult const & result) +{ +#if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3 + return result.end(); +#else + return result.second; +#endif +} + } #endif diff --git a/compilerplugins/clang/salbool.cxx b/compilerplugins/clang/salbool.cxx index f8ae35e41957..5eddba6b5379 100644 --- a/compilerplugins/clang/salbool.cxx +++ b/compilerplugins/clang/salbool.cxx @@ -72,8 +72,10 @@ OverrideKind getOverrideKind(FunctionDecl const * decl) { // encounter in practice: bool hasBoolOverload(FunctionDecl const * decl, bool mustBeDeleted) { unsigned n = decl->getNumParams(); - for (auto d: decl->getDeclContext()->lookup(decl->getDeclName())) { - FunctionDecl const * f = dyn_cast<FunctionDecl>(d); + DeclContextLookupConstResult res + = decl->getDeclContext()->lookup(decl->getDeclName()); + for (auto d = compat::begin(res); d != compat::end(res); ++d) { + FunctionDecl const * f = dyn_cast<FunctionDecl>(*d); if (f != nullptr && (!mustBeDeleted || f->isDeleted())) { if (f->getNumParams() == n) { bool hasSB = false; |