| Index: base/compiler_specific.h
|
| diff --git a/base/compiler_specific.h b/base/compiler_specific.h
|
| index 09b4e7033269c7e9279c37b9c267a5560e7ca06c..fa9983143172855fab2b718f31bfdda77168f8a4 100644
|
| --- a/base/compiler_specific.h
|
| +++ b/base/compiler_specific.h
|
| @@ -154,11 +154,11 @@
|
| // Use like:
|
| // virtual void foo() FINAL;
|
| // class B FINAL : public A {};
|
| -#if defined(COMPILER_MSVC)
|
| +#if defined(__clang__)
|
| +#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(__clang__)
|
| -#define FINAL final
|
| #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.
|
|
|