diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2013-01-16 19:51:59 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2013-01-16 19:51:59 +0000 |
| commit | 235c022296c2dc225bf3b4dfd5c8f8631222e570 (patch) | |
| tree | d3c040a36a83f4fa1492ebd95b4a8fe964f5b56e /include | |
| parent | be2afb6408e88004f8fcc868ff1207fca9792696 (diff) | |
| download | external_llvm-235c022296c2dc225bf3b4dfd5c8f8631222e570.zip external_llvm-235c022296c2dc225bf3b4dfd5c8f8631222e570.tar.gz external_llvm-235c022296c2dc225bf3b4dfd5c8f8631222e570.tar.bz2 | |
[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
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/Support/Compiler.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h index 7e855b2..ebc1fad 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 |