diff options
| author | Alp Toker <alp@nuanti.com> | 2013-12-29 00:49:14 +0000 |
|---|---|---|
| committer | Alp Toker <alp@nuanti.com> | 2013-12-29 00:49:14 +0000 |
| commit | 6f93d65e025fb163e5952136dbc1b3be1f15713e (patch) | |
| tree | eb0c23ccf442c23f86fcfb324285625ed9cd4d0e /include/llvm | |
| parent | ee44e9559f543f77963fe6724798c2b493a25034 (diff) | |
| download | llvm-6f93d65e025fb163e5952136dbc1b3be1f15713e.tar.gz llvm-6f93d65e025fb163e5952136dbc1b3be1f15713e.tar.bz2 llvm-6f93d65e025fb163e5952136dbc1b3be1f15713e.tar.xz | |
Enable deleted functions and explicit conversions in MSVC 2013
Also prospectively enable static_assert as the documentation suggests it's been
available since MSVC 2010. Let's see if the build servers agree.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198142 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm')
| -rw-r--r-- | include/llvm/Support/Compiler.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h index 52c96da584..338a700b70 100644 --- a/include/llvm/Support/Compiler.h +++ b/include/llvm/Support/Compiler.h @@ -136,8 +136,7 @@ /// ... /// }; #if (__has_feature(cxx_deleted_functions) \ - || defined(__GXX_EXPERIMENTAL_CXX0X__)) - // No version of MSVC currently supports this. + || defined(__GXX_EXPERIMENTAL_CXX0X__)) || LLVM_MSC_PREREQ(1800) #define LLVM_DELETED_FUNCTION = delete #else #define LLVM_DELETED_FUNCTION @@ -379,7 +378,7 @@ /// \brief Expands to explicit on compilers which support explicit conversion /// operators. Otherwise expands to nothing. #if (__has_feature(cxx_explicit_conversions) \ - || defined(__GXX_EXPERIMENTAL_CXX0X__)) + || defined(__GXX_EXPERIMENTAL_CXX0X__)) || LLVM_MSC_PREREQ(1800) #define LLVM_EXPLICIT explicit #else #define LLVM_EXPLICIT @@ -387,7 +386,7 @@ /// \macro LLVM_STATIC_ASSERT /// \brief Expands to C/C++'s static_assert on compilers which support it. -#if __has_feature(cxx_static_assert) +#if __has_feature(cxx_static_assert) || 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) |