From ef56c7cdf01e322b063599dec6ded7e436415463 Mon Sep 17 00:00:00 2001 From: JF Bastien Date: Wed, 14 Aug 2019 18:17:06 +0000 Subject: [PATCH] Un-break the bots Some bots can't find is_final despite it being in C++14. Leave the code as it was for now, fix it later when the bots are happy. llvm-svn: 368896 --- llvm/include/llvm/Support/type_traits.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llvm/include/llvm/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h index 403bac7..b580f25 100644 --- a/llvm/include/llvm/Support/type_traits.h +++ b/llvm/include/llvm/Support/type_traits.h @@ -192,7 +192,10 @@ class is_trivially_copyable : public std::true_type { // If the compiler supports detecting whether a class is final, define // an LLVM_IS_FINAL macro. If it cannot be defined properly, this // macro will be left undefined. -#if defined(__cplusplus) || defined(_MSC_VER) +// +// FIXME we should just use std::is_final directly, but some bots are currently +// broken. +#if __cplusplus >= 201402L || defined(_MSC_VER) #define LLVM_IS_FINAL(Ty) std::is_final() #elif __has_feature(is_final) || LLVM_GNUC_PREREQ(4, 7, 0) #define LLVM_IS_FINAL(Ty) __is_final(Ty) -- 2.7.4