[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann]

 compilerplugins/clang/salbool.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 13758a3d154e8e450fdfe8bcdeb6b3a03996c53a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Apr 21 08:51:16 2016 +0200

    SourceManager::isMacroArgExpansion has only one param in older Clang
    
    Change-Id: I5aa4f7cca70b8196263613b92c018323152411a1

diff --git a/compilerplugins/clang/salbool.cxx b/compilerplugins/clang/salbool.cxx
index 1c55e34..ed61b2d 100644
--- a/compilerplugins/clang/salbool.cxx
+++ b/compilerplugins/clang/salbool.cxx
@@ -284,12 +284,12 @@ bool SalBool::VisitCStyleCastExpr(CStyleCastExpr * expr) {
                     compiler.getSourceManager().getImmediateMacroCallerLoc(
                         loc));
                 if (!isFromCIncludeFile(callLoc)) {
-                    SourceLocation argLoc;
                     if (compiler.getSourceManager().isMacroArgExpansion(
-                            expr->getLocStart(), &argLoc)
+                            expr->getLocStart())
                         //TODO: check its the complete (first) arg to the macro
                         && (Lexer::getImmediateMacroName(
-                                argLoc, compiler.getSourceManager(),
+                                expr->getLocStart(),
+                                compiler.getSourceManager(),
                                 compiler.getLangOpts())
                             == "CPPUNIT_ASSERT_EQUAL"))
                     {