summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2014-03-01 10:48:14 +0000
committerChandler Carruth <chandlerc@gmail.com>2014-03-01 10:48:14 +0000
commit16d3ab4f0e3c0ce7e015d5c039b8db0f0572d238 (patch)
tree1a0cbf3af601c7e9dd2cfa4f5a6eae3b3c4a7922 /llvm
parentd7467065eb748420bfa98d7e87b4c6e9c7345479 (diff)
downloadbcm5719-llvm-16d3ab4f0e3c0ce7e015d5c039b8db0f0572d238.tar.gz
bcm5719-llvm-16d3ab4f0e3c0ce7e015d5c039b8db0f0572d238.zip
[C++11] Remove LLVM_HAS_CXX11_TYPETRAITS now that it is a constant due
to the build being C++11. There is clearly still plenty of simplification than can be done here by using standard type traits instead of rolling our own in many places. llvm-svn: 202586
Diffstat (limited to 'llvm')
-rw-r--r--llvm/include/llvm/Support/Compiler.h11
-rw-r--r--llvm/include/llvm/Support/ErrorOr.h2
2 files changed, 0 insertions, 13 deletions
diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h
index f87d797ad23..9c7c827d8f6 100644
--- a/llvm/include/llvm/Support/Compiler.h
+++ b/llvm/include/llvm/Support/Compiler.h
@@ -68,17 +68,6 @@
#define LLVM_HAS_RVALUE_REFERENCE_THIS 0
#endif
-/// \macro LLVM_HAS_CXX11_TYPETRAITS
-/// \brief Does the compiler have the C++11 type traits.
-///
-/// #include <type_traits>
-///
-/// * enable_if
-/// * {true,false}_type
-/// * is_constructible
-/// * etc...
-#define LLVM_HAS_CXX11_TYPETRAITS 1
-
/// \macro LLVM_HAS_CXX11_STDLIB
/// \brief Does the compiler have the C++11 standard library.
///
diff --git a/llvm/include/llvm/Support/ErrorOr.h b/llvm/include/llvm/Support/ErrorOr.h
index 6033d8a97e5..3054b213593 100644
--- a/llvm/include/llvm/Support/ErrorOr.h
+++ b/llvm/include/llvm/Support/ErrorOr.h
@@ -21,9 +21,7 @@
#include "llvm/Support/system_error.h"
#include "llvm/Support/type_traits.h"
#include <cassert>
-#if LLVM_HAS_CXX11_TYPETRAITS
#include <type_traits>
-#endif
namespace llvm {
template<class T, class V>
OpenPOWER on IntegriCloud