llvm.org GIT mirror llvm / 6f93d65
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 Alp Toker 5 years ago
1 changed file(s) with 3 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all
135135 /// ...
136136 /// };
137137 #if (__has_feature(cxx_deleted_functions) \
138 || defined(__GXX_EXPERIMENTAL_CXX0X__))
139 // No version of MSVC currently supports this.
138 || defined(__GXX_EXPERIMENTAL_CXX0X__)) || LLVM_MSC_PREREQ(1800)
140139 #define LLVM_DELETED_FUNCTION = delete
141140 #else
142141 #define LLVM_DELETED_FUNCTION
378377 /// \brief Expands to explicit on compilers which support explicit conversion
379378 /// operators. Otherwise expands to nothing.
380379 #if (__has_feature(cxx_explicit_conversions) \
381 || defined(__GXX_EXPERIMENTAL_CXX0X__))
380 || defined(__GXX_EXPERIMENTAL_CXX0X__)) || LLVM_MSC_PREREQ(1800)
382381 #define LLVM_EXPLICIT explicit
383382 #else
384383 #define LLVM_EXPLICIT
386385
387386 /// \macro LLVM_STATIC_ASSERT
388387 /// \brief Expands to C/C++'s static_assert on compilers which support it.
389 #if __has_feature(cxx_static_assert)
388 #if __has_feature(cxx_static_assert) || LLVM_MSC_PREREQ(1600)
390389 # define LLVM_STATIC_ASSERT(expr, msg) static_assert(expr, msg)
391390 #elif __has_feature(c_static_assert)
392391 # define LLVM_STATIC_ASSERT(expr, msg) _Static_assert(expr, msg)