Chromium Code Reviews| Index: base/compiler_specific.h |
| diff --git a/base/compiler_specific.h b/base/compiler_specific.h |
| index f4f9a11f2e00d6422e6a876e290be5f9b90124b9..79984b807b76136fd0c10e6e75226f2f52fc8907 100644 |
| --- a/base/compiler_specific.h |
| +++ b/base/compiler_specific.h |
| @@ -154,13 +154,8 @@ |
| // Use like: |
| // virtual void foo() FINAL; |
| // class B FINAL : public A {}; |
| -#if defined(__clang__) |
| +#if defined(__clang__) || defined(COMPILER_MSVC) |
|
Nico
2014/04/07 16:44:03
(I tried adding the gcc conditional here too, but
|
| #define FINAL final |
| -#elif defined(COMPILER_MSVC) |
| -// TODO(thakis): Remove if !defined() once Blink is updated too. |
| -#if !defined(FINAL) |
| -#define FINAL final |
| -#endif |
| #elif defined(COMPILER_GCC) && __cplusplus >= 201103 && \ |
| (__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40700 |
| // GCC 4.7 supports explicit virtual overrides when C++11 support is enabled. |