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

Adapt to current Clang trunk towards 3.7

Browse Source 
Change-Id: Ibb2c641d49a1773be789c9259f53a040db6f605f
This commit is contained in:
Stephan Bergmann
2015-08-04 09:36:32 +02:00
parent f17f89aadc
commit c15b4cf39a
7 changed files with 77 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
compilerplugins/clang/inlinesimplememberfunctions.cxx
View File

@@ -31,10 +31,10 @@ private:
};
static bool oneAndOnlyOne(clang::Stmt::const_child_range range) {
if (range.empty()) {
if (compat::begin(range) == compat::end(range)) {
return false;
}
if ((++range.first) != range.second) {
if (++compat::begin(range) != compat::end(range)) {
return false;
}
return true;
@@ -134,7 +134,7 @@ bool InlineSimpleMemberFunctions::VisitCXXMethodDecl(const CXXMethodDecl * funct
{
childStmt2 = *childStmt2->child_begin();
if (dyn_cast<CXXThisExpr>( childStmt2 ) != nullptr
&& childStmt2->children().empty())
&& compat::begin(childStmt2->children()) == compat::end(childStmt2->children()))
{
return true;
}
@@ -145,7 +145,7 @@ bool InlineSimpleMemberFunctions::VisitCXXMethodDecl(const CXXMethodDecl * funct
{
const Stmt* childStmt2 = *childStmt->child_begin();
if (dyn_cast<CXXThisExpr>( childStmt2 ) != nullptr
&& childStmt2->children().empty())
&& compat::begin(childStmt2->children()) == compat::end(childStmt2->children()))
{
return true;
}
@@ -208,7 +208,7 @@ bool InlineSimpleMemberFunctions::VisitCXXMethodDecl(const CXXMethodDecl * funct
}
return true;
}
if ( childStmt->children().empty() )
if ( compat::begin(childStmt->children()) == compat::end(childStmt->children()) )
return true;
childStmt = *childStmt->child_begin();
}