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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/commaoperator.cxx          |    2 +-
 compilerplugins/clang/comparisonwithconstant.cxx |    2 +-
 compilerplugins/clang/consttobool.cxx            |    4 ++--
 compilerplugins/clang/implicitboolconversion.cxx |    4 ++--
 compilerplugins/clang/simplifypointertobool.cxx  |    4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 173bd208abc9aa0b6040dc11602c096a00440976
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Oct 15 08:43:36 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Oct 15 10:45:02 2020 +0200

    Fix checks for "older than Clang 11"
    
    ...following up on b6d0ca04581eae01817aac18d32a312bc9a2d514 "The Clang
    RecursiveASTVisitor change is already in Clang 11"; no longer sure why I
    originally wrote the checks using <= rather than < in
    5d546de67b44dec23ecfa5a6378e2968912f8253 "Adapt to Clang 12 trunk
    RecursiveASTVisitor change"
    
    Change-Id: I79877e21823334c939ecdf9c64e4efe5e0b1571b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104349
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/clang/commaoperator.cxx b/compilerplugins/clang/commaoperator.cxx
index b58fc462dc50..3da4c18d1e10 100644
--- a/compilerplugins/clang/commaoperator.cxx
+++ b/compilerplugins/clang/commaoperator.cxx
@@ -84,7 +84,7 @@ public:
         return ret;
     }
 
-#if CLANG_VERSION <= 100000
+#if CLANG_VERSION < 110000
     bool TraverseBinComma(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
 #endif
 
diff --git a/compilerplugins/clang/comparisonwithconstant.cxx b/compilerplugins/clang/comparisonwithconstant.cxx
index 7fee1175d57e..b5dfe8cc6e7f 100644
--- a/compilerplugins/clang/comparisonwithconstant.cxx
+++ b/compilerplugins/clang/comparisonwithconstant.cxx
@@ -51,7 +51,7 @@ public:
         return ret;
     }
 
-#if CLANG_VERSION <= 100000
+#if CLANG_VERSION < 110000
     bool TraverseBinEQ(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
     bool TraverseBinNE(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
 #endif
diff --git a/compilerplugins/clang/consttobool.cxx b/compilerplugins/clang/consttobool.cxx
index ddcbf85a71c9..4f4755cd8c3c 100644
--- a/compilerplugins/clang/consttobool.cxx
+++ b/compilerplugins/clang/consttobool.cxx
@@ -87,7 +87,7 @@ public:
         return ret;
     }
 
-#if CLANG_VERSION <= 100000
+#if CLANG_VERSION < 110000
     bool TraverseUnaryLNot(UnaryOperator* expr) { return TraverseUnaryOperator(expr); }
 #endif
 
@@ -121,7 +121,7 @@ public:
         return ret;
     }
 
-#if CLANG_VERSION <= 100000
+#if CLANG_VERSION < 110000
     bool TraverseBinLAnd(BinaryOperator* expr) { return TraverseBinaryOperator(expr); }
 #endif
 
diff --git a/compilerplugins/clang/implicitboolconversion.cxx b/compilerplugins/clang/implicitboolconversion.cxx
index 74da9756074e..14574e3cd420 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -253,7 +253,7 @@ public:
 
     bool TraverseBinaryOperator(BinaryOperator * expr);
 
-#if CLANG_VERSION <= 100000
+#if CLANG_VERSION < 110000
     bool TraverseBinLT(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
     bool TraverseBinLE(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
     bool TraverseBinGT(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
@@ -265,7 +265,7 @@ public:
 
     bool TraverseCompoundAssignOperator(CompoundAssignOperator * expr);
 
-#if CLANG_VERSION <= 100000
+#if CLANG_VERSION < 110000
     bool TraverseBinAndAssign(CompoundAssignOperator * expr)
     { return TraverseCompoundAssignOperator(expr); }
     bool TraverseBinOrAssign(CompoundAssignOperator * expr)
diff --git a/compilerplugins/clang/simplifypointertobool.cxx b/compilerplugins/clang/simplifypointertobool.cxx
index 110b526c2101..7afa2d01ec3e 100644
--- a/compilerplugins/clang/simplifypointertobool.cxx
+++ b/compilerplugins/clang/simplifypointertobool.cxx
@@ -78,7 +78,7 @@ public:
         return res;
     }
 
-#if CLANG_VERSION <= 100000
+#if CLANG_VERSION < 110000
     bool TraverseUnaryLNot(UnaryOperator* expr) { return TraverseUnaryOperator(expr); }
 #endif
 
@@ -114,7 +114,7 @@ public:
         return res;
     }
 
-#if CLANG_VERSION <= 100000
+#if CLANG_VERSION < 110000
     bool TraverseBinLAnd(BinaryOperator* expr) { return TraverseBinaryOperator(expr); }
     bool TraverseBinLOr(BinaryOperator* expr) { return TraverseBinaryOperator(expr); }
 #endif