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

Avoid -Werror=deprecated-declarations with recent Clang trunk

Browse Source 
...which first added alternative names to and then deprecated getLocBegin/End

Change-Id: Iaefb8ce259057abfa6cd20f0b63c0ef2949a96b2
Reviewed-on: https://gerrit.libreoffice.org/58820
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2018-08-10 12:35:21 +02:00
parent d1a19ef614
commit 3cc5149a84
64 changed files with 395 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
compilerplugins/clang/useuniqueptr.cxx
View File

@@ -295,7 +295,7 @@ void UseUniquePtr::CheckDeleteExpr(const CXXMethodDecl* methodDecl, const CXXDel
return;
// to ignore things like the CPPUNIT macros
StringRef aFileName = getFileNameOfSpellingLoc(
compiler.getSourceManager().getSpellingLoc(fieldDecl->getLocStart()));
compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(fieldDecl)));
if (loplugin::hasPathnamePrefix(aFileName, WORKDIR "/"))
return;
// passes and stores pointers to member fields
@@ -351,12 +351,12 @@ void UseUniquePtr::CheckDeleteExpr(const CXXMethodDecl* methodDecl, const CXXDel
report(
DiagnosticsEngine::Warning,
message,
deleteExpr->getLocStart())
compat::getBeginLoc(deleteExpr))
<< deleteExpr->getSourceRange();
report(
DiagnosticsEngine::Note,
"member is here",
fieldDecl->getLocStart())
compat::getBeginLoc(fieldDecl))
<< fieldDecl->getSourceRange();
}
@@ -426,7 +426,7 @@ bool UseUniquePtr::VisitCompoundStmt(const CompoundStmt* compoundStmt)
{
if (ignoreLocation(compoundStmt))
return true;
if (isInUnoIncludeFile(compoundStmt->getLocStart()))
if (isInUnoIncludeFile(compat::getBeginLoc(compoundStmt)))
return true;
if (compoundStmt->size() == 0) {
return true;
@@ -457,18 +457,18 @@ bool UseUniquePtr::VisitCompoundStmt(const CompoundStmt* compoundStmt)
return true;
// determine if the var is declared inside the same block as the delete.
// @TODO there should surely be a better way to do this
if (varDecl->getLocStart() < compoundStmt->getLocStart())
if (compat::getBeginLoc(varDecl) < compat::getBeginLoc(compoundStmt))
return true;
report(
DiagnosticsEngine::Warning,
"deleting a local variable at the end of a block, is a sure sign it should be using std::unique_ptr for that var",
deleteExpr->getLocStart())
compat::getBeginLoc(deleteExpr))
<< deleteExpr->getSourceRange();
report(
DiagnosticsEngine::Note,
"var is here",
varDecl->getLocStart())
compat::getBeginLoc(varDecl))
<< varDecl->getSourceRange();
return true;
}
@@ -492,7 +492,7 @@ bool UseUniquePtr::VisitCXXDeleteExpr(const CXXDeleteExpr* deleteExpr)
return true;
if (ignoreLocation(mpCurrentFunctionDecl))
return true;
if (isInUnoIncludeFile(mpCurrentFunctionDecl->getCanonicalDecl()->getLocStart()))
if (isInUnoIncludeFile(compat::getBeginLoc(mpCurrentFunctionDecl->getCanonicalDecl())))
return true;
if (mpCurrentFunctionDecl->getIdentifier())
{
@@ -527,7 +527,7 @@ bool UseUniquePtr::VisitCXXDeleteExpr(const CXXDeleteExpr* deleteExpr)
report(
DiagnosticsEngine::Warning,
"calling delete on a pointer param, should be either whitelisted here or simplified",
deleteExpr->getLocStart())
compat::getBeginLoc(deleteExpr))
<< deleteExpr->getSourceRange();
return true;
}