Chromium Code Reviews| Index: base/compiler_specific.h |
| diff --git a/base/compiler_specific.h b/base/compiler_specific.h |
| index 16837dff479fcbca7b2a3109d9ef473bc78565df..79984b807b76136fd0c10e6e75226f2f52fc8907 100644 |
| --- a/base/compiler_specific.h |
| +++ b/base/compiler_specific.h |
| @@ -154,11 +154,8 @@ |
| // Use like: |
| // virtual void foo() FINAL; |
| // class B FINAL : public A {}; |
| -#if defined(__clang__) |
| +#if defined(__clang__) || defined(COMPILER_MSVC) |
| #define FINAL final |
| -#elif defined(COMPILER_MSVC) |
| -// TODO(jered): Change this to "final" when chromium no longer uses MSVC 2010. |
| -#define FINAL sealed |
| #elif defined(COMPILER_GCC) && __cplusplus >= 201103 && \ |
|
scottmg
2014/04/04 00:30:04
guess you could merge all this too, but maybe it's
|
| (__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40700 |
| // GCC 4.7 supports explicit virtual overrides when C++11 support is enabled. |