diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-19 10:56:35 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-19 10:56:35 +0200 |
| commit | d6ff3d49df1fbe2731e4ba2076f4faa63ded9b11 (patch) | |
| tree | 5c664bb6e8e4c7d90b2825448e764f396d71bdb8 | |
| parent | 66b3aa76b161c4d08e87fbdb19c2b72cc15153cd (diff) | |
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
| -rw-r--r-- | compilerplugins/clang/plugin.cxx | 3 | ||||
| -rw-r--r-- | compilerplugins/clang/unreffun.cxx | 8 | ||||
| -rw-r--r-- | sc/qa/extras/scannotationshapeobj.cxx | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx index dc48101f6e13..143897b499d5 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 0284d36ef87c..1dac4d7b276b 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 7eefd0c043f2..6b18077e86c0 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: */ |