6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-28 04:33:05 +00:00
Code Issues Projects Releases Wiki Activity

MSVC 2010 build fix

Browse Source 
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
This commit is contained in:
Alp Toker 2014-01-03 07:58:20 +00:00
parent 3036182e99
commit 8bd582a3ff
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Support/Compiler.h
View File

@ -154,8 +154,6 @@
#if __has_feature(cxx_override_control) || \ #if __has_feature(cxx_override_control) || \
defined(__GXX_EXPERIMENTAL_CXX0X__) || LLVM_MSC_PREREQ(1700) defined(__GXX_EXPERIMENTAL_CXX0X__) || LLVM_MSC_PREREQ(1700)
#define LLVM_FINAL final #define LLVM_FINAL final
#elif LLVM_MSC_PREREQ(1600)
#define LLVM_FINAL sealed
#else #else
#define LLVM_FINAL #define LLVM_FINAL
#endif #endif
@ -163,7 +161,7 @@
/// LLVM_OVERRIDE - Expands to 'override' if the compiler supports it. /// LLVM_OVERRIDE - Expands to 'override' if the compiler supports it.
/// Use to mark virtual methods as overriding a base class method. /// Use to mark virtual methods as overriding a base class method.
#if __has_feature(cxx_override_control) || \ #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 #define LLVM_OVERRIDE override
#else #else
#define LLVM_OVERRIDE #define LLVM_OVERRIDE