diff options
| author | JF Bastien <jfbastien@apple.com> | 2019-08-14 19:19:41 +0000 |
|---|---|---|
| committer | JF Bastien <jfbastien@apple.com> | 2019-08-14 19:19:41 +0000 |
| commit | c2649928533b1f943e996893b71c2f13c7cd8c79 (patch) | |
| tree | 26397c9509d8aeab686aeed1a70d50f0747046f1 | |
| parent | 0b864bb04322d06a6953f56befe415e29519cbf7 (diff) | |
| download | bcm5719-llvm-c2649928533b1f943e996893b71c2f13c7cd8c79.tar.gz bcm5719-llvm-c2649928533b1f943e996893b71c2f13c7cd8c79.zip | |
Revert "Un-break the bots"
Looks like the problem was due to the cmake cache, Chris fixed in r368897.
llvm-svn: 368902
| -rw-r--r-- | llvm/include/llvm/Support/type_traits.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/llvm/include/llvm/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h index b580f25fd18..403bac7260b 100644 --- a/llvm/include/llvm/Support/type_traits.h +++ b/llvm/include/llvm/Support/type_traits.h @@ -192,10 +192,7 @@ class is_trivially_copyable<T*> : 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<Ty>() #elif __has_feature(is_final) || LLVM_GNUC_PREREQ(4, 7, 0) #define LLVM_IS_FINAL(Ty) __is_final(Ty) |
