diff options
| -rw-r--r-- | compilerplugins/clang/compat.hxx | 16 | ||||
| -rw-r--r-- | compilerplugins/clang/salbool.cxx | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx index 66963db88a63..dd1d7e3537c2 100644 --- a/compilerplugins/clang/compat.hxx +++ b/compilerplugins/clang/compat.hxx @@ -176,9 +176,15 @@ 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__ >= 7) || __clang_major__ > 3 +typedef clang::DeclContext::lookup_result DeclContextLookupResult; +typedef clang::DeclContext::lookup_iterator DeclContextLookupIterator; +#else +typedef clang::DeclContext::lookup_const_result DeclContextLookupResult; +typedef clang::DeclContext::lookup_const_iterator DeclContextLookupIterator; +#endif + +inline DeclContextLookupIterator begin(DeclContextLookupResult const & result) { #if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3 return result.begin(); #else @@ -186,9 +192,7 @@ inline clang::NamedDecl * const * begin( #endif } -inline clang::NamedDecl * const * end( - clang::DeclContextLookupConstResult const & result) -{ +inline DeclContextLookupIterator end(DeclContextLookupResult const & result) { #if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3 return result.end(); #else diff --git a/compilerplugins/clang/salbool.cxx b/compilerplugins/clang/salbool.cxx index b32c0a758b94..f5ee945db673 100644 --- a/compilerplugins/clang/salbool.cxx +++ b/compilerplugins/clang/salbool.cxx @@ -85,8 +85,7 @@ OverrideKind getOverrideKind(FunctionDecl const * decl) { // encounter in practice: bool hasBoolOverload(FunctionDecl const * decl, bool mustBeDeleted) { unsigned n = decl->getNumParams(); - DeclContextLookupConstResult res - = decl->getDeclContext()->lookup(decl->getDeclName()); + auto 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())) { |