diff options
| author | Alp Toker <alp@nuanti.com> | 2014-01-03 07:58:20 +0000 |
|---|---|---|
| committer | Alp Toker <alp@nuanti.com> | 2014-01-03 07:58:20 +0000 |
| commit | 8bd582a3ffd37e661c5b931c9fc868a3dcbfcbae (patch) | |
| tree | 13c390de668df6a3ccdb6e9919f0b34033ff1917 /include | |
| parent | 3036182e99f4efe74aa1309963271004ed71823b (diff) | |
| download | llvm-8bd582a3ffd37e661c5b931c9fc868a3dcbfcbae.tar.gz llvm-8bd582a3ffd37e661c5b931c9fc868a3dcbfcbae.tar.bz2 llvm-8bd582a3ffd37e661c5b931c9fc868a3dcbfcbae.tar.xz | |
MSVC 2010 build fix
Back out the part of r198399 that enabled LLVM_FINAL/LLVM_OVERRIDE on VS 2010.
DwarfUnit.h legitimately uses them on destructors which unfortunately triggers
Compiler Error C3665 (override specifier not allowed on a destructor/finalizer)
prior to MSVC 2012:
virtual ~DwarfCompileUnit() LLVM_OVERRIDE;
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198401 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/Support/Compiler.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h index 413260f232..d4f55e1a1b 100644 --- a/include/llvm/Support/Compiler.h +++ b/include/llvm/Support/Compiler.h @@ -154,8 +154,6 @@ #if __has_feature(cxx_override_control) || \ defined(__GXX_EXPERIMENTAL_CXX0X__) || LLVM_MSC_PREREQ(1700) #define LLVM_FINAL final -#elif LLVM_MSC_PREREQ(1600) -#define LLVM_FINAL sealed #else #define LLVM_FINAL #endif @@ -163,7 +161,7 @@ /// 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) || \ - defined(__GXX_EXPERIMENTAL_CXX0X__) || LLVM_MSC_PREREQ(1600) + defined(__GXX_EXPERIMENTAL_CXX0X__) || LLVM_MSC_PREREQ(1700) #define LLVM_OVERRIDE override #else #define LLVM_OVERRIDE |