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

Stephan Bergmann sbergman at redhat.com
Wed Oct 19 08:58:38 UTC 2016


 compilerplugins/clang/plugin.cxx      |    3 +--
 compilerplugins/clang/unreffun.cxx    |    8 ++++++++
 sc/qa/extras/scannotationshapeobj.cxx |    4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit d6ff3d49df1fbe2731e4ba2076f4faa63ded9b11
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 19 10:56:35 2016 +0200

    Plugin::isInUnoIncludeFile should not cover WORKDIR
    
    ...that got in, for no apparent reason, when various, slightly different
    implementations of isInUnoIncludeFile got consolidated into one.
    
    Change-Id: I64a9eb62703d57a0b7b57720ec9f251ffa780691

diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index dc48101..143897b 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -166,8 +166,7 @@ bool Plugin::isInUnoIncludeFile(SourceLocation spellingLocation) const {
            || name.startswith(SRCDIR "/include/salhelper/")
            || name.startswith(SRCDIR "/include/systools/")
            || name.startswith(SRCDIR "/include/typelib/")
-           || name.startswith(SRCDIR "/include/uno/")
-           || name.startswith(WORKDIR "/"));
+           || name.startswith(SRCDIR "/include/uno/"));
 }
 
 bool Plugin::isInUnoIncludeFile(const FunctionDecl* functionDecl) const {
diff --git a/compilerplugins/clang/unreffun.cxx b/compilerplugins/clang/unreffun.cxx
index 0284d36..1dac4d7 100644
--- a/compilerplugins/clang/unreffun.cxx
+++ b/compilerplugins/clang/unreffun.cxx
@@ -133,6 +133,14 @@ bool UnrefFun::VisitFunctionDecl(FunctionDecl const * decl) {
     {
         return true;
     }
+    auto loc = decl->getLocation();
+    if (compiler.getSourceManager().isMacroBodyExpansion(loc)
+        && (Lexer::getImmediateMacroName(
+                loc, compiler.getSourceManager(), compiler.getLangOpts())
+            == "MDDS_MTV_DEFINE_ELEMENT_CALLBACKS"))
+    {
+        return true;
+    }
     report(
         DiagnosticsEngine::Warning,
         (canon->isDefined()
diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx
index 7eefd0c..6b18077 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -116,8 +116,8 @@ uno::Reference<text::XTextContent> ScAnnotationShapeObj::getTextContent()
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnotationShapeObj);
 
-CPPUNIT_PLUGIN_IMPLEMENT();
-
 }
 
+CPPUNIT_PLUGIN_IMPLEMENT();
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list