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

diff --git a/include/llvm/Support/type_traits.h b/include/llvm/Support/type_traits.h
index b580f25fd18f5b2261fb789336092c7deba0c124..403bac7260bdcaf7e0d265833f5806bc4589ef38 100644 (file)
--- a/include/llvm/Support/type_traits.h
+++ b/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)