From 0ab8c7bd1dbde4d80b9e4afe2fb81250c3520d8c Mon Sep 17 00:00:00 2001 From: JF Bastien Date: Wed, 14 Aug 2019 19:19:41 +0000 Subject: [PATCH] Revert "Un-break the bots" Looks like the problem was due to the cmake cache, Chris fixed in r368897. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@368902 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/type_traits.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/llvm/Support/type_traits.h b/include/llvm/Support/type_traits.h index b580f25fd18..403bac7260b 100644 --- a/include/llvm/Support/type_traits.h +++ b/include/llvm/Support/type_traits.h @@ -192,10 +192,7 @@ 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. -// -// FIXME we should just use std::is_final directly, but some bots are currently -// broken. -#if __cplusplus >= 201402L || defined(_MSC_VER) +#if defined(__cplusplus) || 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.49.0