[llvm] r229333 - Since MSVC 1800 is our lowest common denominator, we don't need an explicit check for it in these macros any longer; NFC.

[Aaron Ballman]

Author: aaronballman
Date: Sun Feb 15 15:21:52 2015
New Revision: 229333

URL: http://llvm.org/viewvc/llvm-project?rev=229333&view=rev
Log:
Since MSVC 1800 is our lowest common denominator, we don't need an explicit check for it in these macros any longer; NFC.

Modified:
    llvm/trunk/include/llvm/Support/Compiler.h

Modified: llvm/trunk/include/llvm/Support/Compiler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Compiler.h?rev=229333&r1=229332&r2=229333&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/Compiler.h (original)
+++ llvm/trunk/include/llvm/Support/Compiler.h Sun Feb 15 15:21:52 2015
@@ -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