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

[Noel Grandin]

 compilerplugins/clang/sallogareas.cxx |    3 +++
 compilerplugins/clang/sallogareas.hxx |    2 ++
 2 files changed, 5 insertions(+)

New commits:
commit bd6723fd539bb63d230a2f985ac98ff7daafcbff
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Dec 15 14:11:16 2016 +0200

    disable the 'two different log areas in the same file' loplugin check
    
    too many false+ to leave it alive by default
    
    Change-Id: I6d8f92b630c351c1ac788fad79f8d7c435ba4963

diff --git a/compilerplugins/clang/sallogareas.cxx b/compilerplugins/clang/sallogareas.cxx
index 85f90e3..d549187 100644
--- a/compilerplugins/clang/sallogareas.cxx
+++ b/compilerplugins/clang/sallogareas.cxx
@@ -110,6 +110,8 @@ void SalLogAreas::checkArea( StringRef area, SourceLocation location )
         checkAreaSyntax(area, location);
         return;
         }
+// don't leave this alive by default, generates too many false+
+#if 0
     if (compiler.getSourceManager().isInMainFile(location))
         {
         auto matchpair = [this,area](StringRef p1, StringRef p2) {
@@ -166,6 +168,7 @@ void SalLogAreas::checkArea( StringRef area, SourceLocation location )
                 firstSeenLocation );
             }
         }
+#endif
     }
 
 void SalLogAreas::checkAreaSyntax(StringRef area, SourceLocation location) {
diff --git a/compilerplugins/clang/sallogareas.hxx b/compilerplugins/clang/sallogareas.hxx
index a689ce9..9133ed6 100644
--- a/compilerplugins/clang/sallogareas.hxx
+++ b/compilerplugins/clang/sallogareas.hxx
@@ -35,8 +35,10 @@ class SalLogAreas
         const FunctionDecl* inFunction;
         SourceLocation lastSalDetailLogStreamMacro;
         set< string > logAreas;
+#if 0
         string firstSeenLogArea;
         SourceLocation firstSeenLocation;
+#endif
     };
 
 } // namespace