[llvm] r368902 - Revert "Un-break the bots"

[JF Bastien via llvm-commits]

Author: jfb
Date: Wed Aug 14 12:19:41 2019
New Revision: 368902

URL: http://llvm.org/viewvc/llvm-project?rev=368902&view=rev
Log:
Revert "Un-break the bots"

Looks like the problem was due to the cmake cache, Chris fixed in r368897.

Modified:
    llvm/trunk/include/llvm/Support/type_traits.h

Modified: llvm/trunk/include/llvm/Support/type_traits.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/type_traits.h?rev=368902&r1=368901&r2=368902&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/type_traits.h (original)
+++ llvm/trunk/include/llvm/Support/type_traits.h Wed Aug 14 12:19:41 2019
@@ -192,10 +192,7 @@ class is_trivially_copyable<T*> : public
 // 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)