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

Adapt to Clang 3.4 (in preparation of a buildbot on CentOS 7)

Browse Source 
Change-Id: Ie2859f03b31c57deb7fd0deba3285f782e33b239
This commit is contained in:
Stephan Bergmann
2016-06-28 16:25:55 +02:00
parent 36936d5a8c
commit 9308f35318
13 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compilerplugins/clang/vclwidgets.cxx
View File

@@ -205,9 +205,11 @@ bool VCLWidgets::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorD
if (pCompoundStatement) {
bool bFoundDisposeOnce = false;
int nNumExtraStatements = 0;
for(auto const * x : pCompoundStatement->body())
for (auto i = pCompoundStatement->body_begin();
i != pCompoundStatement->body_end(); ++i)
{
const CXXMemberCallExpr *pCallExpr = dyn_cast<CXXMemberCallExpr>(x);
const CXXMemberCallExpr *pCallExpr = dyn_cast<CXXMemberCallExpr>(
*i);
if (pCallExpr) {
if( const FunctionDecl* func = pCallExpr->getDirectCallee()) {
if( func->getNumParams() == 0 && func->getIdentifier() != NULL
@@ -217,7 +219,7 @@ bool VCLWidgets::VisitCXXDestructorDecl(const CXXDestructorDecl* pCXXDestructorD
}
}
// checking for ParenExpr is a hacky way to ignore assert statements in older versions of clang (i.e. <= 3.2)
if (!pCallExpr && !dyn_cast<ParenExpr>(x))
if (!pCallExpr && !dyn_cast<ParenExpr>(*i))
nNumExtraStatements++;
}
bOk = bFoundDisposeOnce && nNumExtraStatements == 0;