From: Michael J. Spencer <bigcheesegs@gmail.com>
Date: Wed, 16 Jan 2013 19:51:59 +0000 (+0000)
Subject: [Support] Update MSVC compiler support in Compiler.h.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=235c022296c2dc225bf3b4dfd5c8f8631222e570;p=oota-llvm.git

[Support] Update MSVC compiler support in Compiler.h.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@172644 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h
index 7e855b2f10c..ebc1fadc149 100644
--- a/include/llvm/Support/Compiler.h
+++ b/include/llvm/Support/Compiler.h
@@ -81,7 +81,8 @@
 
 /// LLVM_FINAL - Expands to 'final' if the compiler supports it.
 /// Use to mark classes or virtual methods as final.
-#if (__has_feature(cxx_override_control))
+#if __has_feature(cxx_override_control) \
+    || (defined(_MSC_VER) && _MSC_VER >= 1700)
 #define LLVM_FINAL final
 #else
 #define LLVM_FINAL
@@ -89,7 +90,8 @@
 
 /// LLVM_OVERRIDE - Expands to 'override' if the compiler supports it.
 /// Use to mark virtual methods as overriding a base class method.
-#if (__has_feature(cxx_override_control))
+#if __has_feature(cxx_override_control) \
+    || (defined(_MSC_VER) && _MSC_VER >= 1700)
 #define LLVM_OVERRIDE override
 #else
 #define LLVM_OVERRIDE