maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[C++11] Replace LLVM_STATIC_ASSERT with static_assert, we now have 

access to it on all host toolchains.

llvm-svn: 202642
This commit is contained in:
Chandler Carruth 2014-03-02 13:10:45 +00:00
parent 7bc33bf934
commit cf01800b1f
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
llvm/include/llvm/Support/Compiler.h
View File

@ -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

4
llvm/lib/Support/ThreadLocal.cpp
View File

@ -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);

3
llvm/unittests/IR/ValueMapTest.cpp
View File

@ -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) {