From 734d3582745b5440b9c18c52bec71899b58798d5 Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Sun, 15 Feb 2015 21:21:52 +0000 Subject: [PATCH] Since MSVC 1800 is our lowest common denominator, we don't need an explicit check for it in these macros any longer; NFC. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229333 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/Compiler.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h index 40bf25ad63d..f9bcd2827fd 100644 --- a/include/llvm/Support/Compiler.h +++ b/include/llvm/Support/Compiler.h @@ -103,8 +103,7 @@ /// public: /// ... /// }; -#if __has_feature(cxx_deleted_functions) || \ - defined(__GXX_EXPERIMENTAL_CXX0X__) || LLVM_MSC_PREREQ(1800) +#if __has_feature(cxx_deleted_functions) || defined(__GXX_EXPERIMENTAL_CXX0X__) #define LLVM_DELETED_FUNCTION = delete #else #define LLVM_DELETED_FUNCTION @@ -344,7 +343,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__) || LLVM_MSC_PREREQ(1800) + defined(__GXX_EXPERIMENTAL_CXX0X__) #define LLVM_EXPLICIT explicit #else #define LLVM_EXPLICIT