[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 b6d0ca04581eae01817aac18d32a312bc9a2d514
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Oct 14 16:22:44 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Oct 14 22:13:08 2020 +0200

    The Clang RecursiveASTVisitor change is already in Clang 11
    
    ...see 5d546de67b44dec23ecfa5a6378e2968912f8253 "Adapt to Clang 12 trunk
    RecursiveASTVisitor change"; no longer sure why I thought <https://github.com/
    llvm/llvm-project/commit/5689b38c6a4220cc5f6ba68a56486229b10071bf> "Removed a
    RecursiveASTVisitor feature to visit operator kinds with different methods"
    would not be included in the release/11.x branch
    
    Change-Id: I1e206368c447b74cc6adec4c1d4790c80f0cb744
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104309
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/clang/commaoperator.cxx b/compilerplugins/clang/commaoperator.cxx
index 423bd49e5e43..b58fc462dc50 100644
--- a/compilerplugins/clang/commaoperator.cxx
+++ b/compilerplugins/clang/commaoperator.cxx
@@ -84,7 +84,7 @@ public:
         return ret;
     }
 
-#if CLANG_VERSION <= 110000
+#if CLANG_VERSION <= 100000
     bool TraverseBinComma(BinaryOperator * expr) { return TraverseBinaryOperator(expr); }
 #endif
 
diff --git a/compilerplugins/clang/comparisonwithconstant.cxx b/compilerplugins/clang/comparisonwithconstant.cxx
index 284e5567b65f..7fee1175d57e 100644
--- a/compilerplugins/clang/comparisonwithconstant.cxx
+++ b/compilerplugins/clang/comparisonwithconstant.cxx
@@ -51,7 +51,7 @@ public:
         return ret;
     }
 
-#if CLANG_VERSION <= 110000
+#if CLANG_VERSION <= 100000
     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 b8933b231621..ddcbf85a71c9 100644
--- a/compilerplugins/clang/consttobool.cxx
+++ b/compilerplugins/clang/consttobool.cxx
@@ -87,7 +87,7 @@ public:
         return ret;
     }
 
-#if CLANG_VERSION <= 110000
+#if CLANG_VERSION <= 100000
     bool TraverseUnaryLNot(UnaryOperator* expr) { return TraverseUnaryOperator(expr); }
 #endif
 
@@ -121,7 +121,7 @@ public:
         return ret;
     }
 
-#if CLANG_VERSION <= 110000
+#if CLANG_VERSION <= 100000
     bool TraverseBinLAnd(BinaryOperator* expr) { return TraverseBinaryOperator(expr); }
 #endif
 
diff --git a/compilerplugins/clang/implicitboolconversion.cxx b/compilerplugins/clang/implicitboolconversion.cxx
index 14db22788596..74da9756074e 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -253,7 +253,7 @@ public:
 
     bool TraverseBinaryOperator(BinaryOperator * expr);
 
-#if CLANG_VERSION <= 110000
+#if CLANG_VERSION <= 100000
     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 <= 110000
+#if CLANG_VERSION <= 100000
     bool TraverseBinAndAssign(CompoundAssignOperator * expr)
     { return TraverseCompoundAssignOperator(expr); }
     bool TraverseBinOrAssign(CompoundAssignOperator * expr)
diff --git a/compilerplugins/clang/simplifypointertobool.cxx b/compilerplugins/clang/simplifypointertobool.cxx
index 756985c760fa..110b526c2101 100644
--- a/compilerplugins/clang/simplifypointertobool.cxx
+++ b/compilerplugins/clang/simplifypointertobool.cxx
@@ -78,7 +78,7 @@ public:
         return res;
     }
 
-#if CLANG_VERSION <= 110000
+#if CLANG_VERSION <= 100000
     bool TraverseUnaryLNot(UnaryOperator* expr) { return TraverseUnaryOperator(expr); }
 #endif
 
@@ -114,7 +114,7 @@ public:
         return res;
     }
 
-#if CLANG_VERSION <= 110000
+#if CLANG_VERSION <= 100000
     bool TraverseBinLAnd(BinaryOperator* expr) { return TraverseBinaryOperator(expr); }
     bool TraverseBinLOr(BinaryOperator* expr) { return TraverseBinaryOperator(expr); }
 #endif