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

compat for Clang 3.2

Browse Source 
Change-Id: I2746abd05edd00dadfe613c17b9874b1035c3be4
This commit is contained in:
Stephan Bergmann
2014-07-02 19:19:17 +02:00
parent 37b1835972
commit 4da8281d5a
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
compilerplugins/clang/compat.hxx
View File

@@ -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

6
compilerplugins/clang/salbool.cxx
View File

@@ -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;