diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2014-03-02 13:10:45 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2014-03-02 13:10:45 +0000 |
| commit | fc6d7d6cf53a539555f2065a059300e181ddb94b (patch) | |
| tree | 60a850e37851f56c889d017fa0bd5beb1fa689bf | |
| parent | 742e43f807a528e5906a8eec67509baf9ae15bff (diff) | |
| download | llvm-fc6d7d6cf53a539555f2065a059300e181ddb94b.tar.gz llvm-fc6d7d6cf53a539555f2065a059300e181ddb94b.tar.bz2 llvm-fc6d7d6cf53a539555f2065a059300e181ddb94b.tar.xz | |
[C++11] Replace LLVM_STATIC_ASSERT with static_assert, we now have
access to it on all host toolchains.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202642 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/Support/Compiler.h | 13 | ||||
| -rw-r--r-- | lib/Support/ThreadLocal.cpp | 4 | ||||
| -rw-r--r-- | unittests/IR/ValueMapTest.cpp | 3 |
3 files changed, 3 insertions, 17 deletions
diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h index 9ac1ce9a35..1edcd45bc3 100644 --- a/include/llvm/Support/Compiler.h +++ b/include/llvm/Support/Compiler.h @@ -333,19 +333,6 @@ #define LLVM_EXPLICIT #endif -/// \macro LLVM_STATIC_ASSERT -/// \brief Expands to C/C++'s static_assert on compilers which support it. -#if __has_feature(cxx_static_assert) || \ - defined(__GXX_EXPERIMENTAL_CXX0X__) || LLVM_MSC_PREREQ(1600) -# define LLVM_STATIC_ASSERT(expr, msg) static_assert(expr, msg) -#elif __has_feature(c_static_assert) -# define LLVM_STATIC_ASSERT(expr, msg) _Static_assert(expr, msg) -#elif __has_extension(c_static_assert) -# define LLVM_STATIC_ASSERT(expr, msg) LLVM_EXTENSION _Static_assert(expr, msg) -#else -# define LLVM_STATIC_ASSERT(expr, msg) -#endif - /// \brief Does the compiler support generalized initializers (using braced /// lists and std::initializer_list). While clang may claim it supports general /// initializers, if we're using MSVC's headers, we might not have a usable diff --git a/lib/Support/ThreadLocal.cpp b/lib/Support/ThreadLocal.cpp index 38ab29b7ff..aebbcad25c 100644 --- a/lib/Support/ThreadLocal.cpp +++ b/lib/Support/ThreadLocal.cpp @@ -27,7 +27,7 @@ using namespace sys; ThreadLocalImpl::ThreadLocalImpl() : data() { } ThreadLocalImpl::~ThreadLocalImpl() { } void ThreadLocalImpl::setInstance(const void* d) { - LLVM_STATIC_ASSERT(sizeof(d) <= sizeof(data), "size too big"); + static_assert(sizeof(d) <= sizeof(data), "size too big"); void **pd = reinterpret_cast<void**>(&data); *pd = const_cast<void*>(d); } @@ -51,7 +51,7 @@ namespace llvm { using namespace sys; ThreadLocalImpl::ThreadLocalImpl() : data() { - LLVM_STATIC_ASSERT(sizeof(pthread_key_t) <= sizeof(data), "size too big"); + static_assert(sizeof(pthread_key_t) <= sizeof(data), "size too big"); pthread_key_t* key = reinterpret_cast<pthread_key_t*>(&data); int errorcode = pthread_key_create(key, NULL); assert(errorcode == 0); diff --git a/unittests/IR/ValueMapTest.cpp b/unittests/IR/ValueMapTest.cpp index 5493e3e1e3..4c8a4a9372 100644 --- a/unittests/IR/ValueMapTest.cpp +++ b/unittests/IR/ValueMapTest.cpp @@ -117,8 +117,7 @@ TYPED_TEST(ValueMapTest, OperationsWork) { template<typename ExpectedType, typename VarType> void CompileAssertHasType(VarType) { - LLVM_STATIC_ASSERT((is_same<ExpectedType, VarType>::value), - "Not the same type"); + static_assert((is_same<ExpectedType, VarType>::value), "Not the same type"); } TYPED_TEST(ValueMapTest, Iteration) { |