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

[Noel Grandin]

 compilerplugins/clang/store/cstylecast.cxx |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 14c94c97ffcb4b51974a8177a8017d620b4d9293
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Dec 4 11:19:19 2014 +0200

    cstylecast plugin - exclude some more files
    
    Change-Id: I4dc6cc7f461fa11d12bf6fd9700befe4bbdac62c

diff --git a/compilerplugins/clang/store/cstylecast.cxx b/compilerplugins/clang/store/cstylecast.cxx
index b8f7325..b036e1b 100644
--- a/compilerplugins/clang/store/cstylecast.cxx
+++ b/compilerplugins/clang/store/cstylecast.cxx
@@ -73,11 +73,18 @@ bool CStyleCast::VisitCStyleCastExpr(const CStyleCastExpr * expr) {
     if ( filename.endswith(".h") ) {
         return true;
     }
-    if ( compat::isInMainFile(compiler.getSourceManager(), spellingLocation)
-        ? (filename.startswith(SRCDIR "/sal") // sal has tons of weird stuff going on that I don't understand enough to fix
-           || filename.startswith(SRCDIR "/bridges")) // I'm not messing with this code - far too dangerous
-        : (filename.startswith(SRCDIR "/include/tools/solar.h")) ) {
-        return true;
+    if ( compat::isInMainFile(compiler.getSourceManager(), spellingLocation) ) {
+        if (filename.startswith(SRCDIR "/sal") // sal has tons of weird stuff going on that I don't understand enough to fix
+           || filename.startswith(SRCDIR "/bridges")) { // I'm not messing with this code - far too dangerous
+            return true;
+        }
+    } else {
+        if (filename.startswith(SRCDIR "/include/tools/solar.h")
+           // the GetSalDisplay/GetGtkDisplay methods are problematic
+           || filename.startswith(SRCDIR "/vcl/inc/generic/gendata.hxx")
+           || filename.startswith(SRCDIR "/include/cppuhelper/")) {
+            return true;
+        }
     }
     report(
         DiagnosticsEngine::Warning,