summaryrefslogtreecommitdiff
path: root/compilerplugins/clang/compat.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-28 12:36:29 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-29 07:17:07 +0100
commitda9fb5d6d9ebf9363981c370ce937d8848989fcb (patch)
treefff14dd2bb7349e26bab49d75aa2b9e9a2f18eea /compilerplugins/clang/compat.hxx
parent1215b3cf095e5baa73bd422ef396eb6245b95303 (diff)
comment out the EvaluateAsInt compat code for now
sberg: Note how that Clang change keeps getting reverted; latest one is <http://llvm.org/viewvc/llvm-project?view=revision&revision=347656> "Revert r347417 'Re-Reinstate 347294 with a fix for the failures.'" But lets wait a little while to see how things settle there. Change-Id: I05b34ca1377792bcb4c557defd3e9b5d11ee2b14 Reviewed-on: https://gerrit.libreoffice.org/64168 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'compilerplugins/clang/compat.hxx')
-rw-r--r--compilerplugins/clang/compat.hxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 97410fcbdc7a..7a518770a3b6 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -157,7 +157,8 @@ inline bool CPlusPlus17(clang::LangOptions const & opts) {
}
inline bool EvaluateAsInt(clang::Expr const * expr, llvm::APSInt& intRes, const clang::ASTContext& ctx) {
-#if CLANG_VERSION >= 80000
+// this keeps getting landed and then reverted in clang
+#if 0 && CLANG_VERSION >= 80000
clang::Expr::EvalResult res;
bool b = expr->EvaluateAsInt(res, ctx);
if (b && res.Val.isInt())