mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt compilerplugins to Clang trunk towards 3.7

Browse Source 
Change-Id: I5b41039bf63a4c2f313fe7a57c0f6934dcb0752d
This commit is contained in:
Stephan Bergmann
2015-02-26 17:21:37 +01:00
parent c57213764b
commit 193957750a
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
compilerplugins/clang/compat.hxx
View File

@@ -176,9 +176,15 @@ inline std::unique_ptr<llvm::raw_fd_ostream> create_raw_fd_ostream(
#endif #endif
} }
inline clang::NamedDecl * const * begin( #if (__clang_major__ == 3 && __clang_minor__ >= 7) || __clang_major__ > 3
clang::DeclContextLookupConstResult const & result) 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 #if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3
return result.begin(); return result.begin();
#else #else
@@ -186,9 +192,7 @@ inline clang::NamedDecl * const * begin(
#endif #endif
} }
inline clang::NamedDecl * const * end( inline DeclContextLookupIterator end(DeclContextLookupResult const & result) {
clang::DeclContextLookupConstResult const & result)
{
#if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3 #if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3
return result.end(); return result.end();
#else #else

3
compilerplugins/clang/salbool.cxx
View File

@@ -85,8 +85,7 @@ OverrideKind getOverrideKind(FunctionDecl const * decl) {
// encounter in practice: // encounter in practice:
bool hasBoolOverload(FunctionDecl const * decl, bool mustBeDeleted) { bool hasBoolOverload(FunctionDecl const * decl, bool mustBeDeleted) {
unsigned n = decl->getNumParams(); unsigned n = decl->getNumParams();
DeclContextLookupConstResult res auto res = decl->getDeclContext()->lookup(decl->getDeclName());
= decl->getDeclContext()->lookup(decl->getDeclName());
for (auto d = compat::begin(res); d != compat::end(res); ++d) { for (auto d = compat::begin(res); d != compat::end(res); ++d) {
FunctionDecl const * f = dyn_cast<FunctionDecl>(*d); FunctionDecl const * f = dyn_cast<FunctionDecl>(*d);
if (f != nullptr && (!mustBeDeleted || f->isDeleted())) { if (f != nullptr && (!mustBeDeleted || f->isDeleted())) {