gfx/skia/patches/archive/0005-Bug-731384-Fix-clang-SK_OVERRIDE.patch@b8a032363ba2 (annotated)
gfx/skia/patches/archive/0005-Bug-731384-Fix-clang-SK_OVERRIDE.patch
Thu, 22 Jan 2015 13:21:57 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 22 Jan 2015 13:21:57 +0100
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
- permissions
- -rw-r--r--
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
| michael@0 | 1 | From 80350275c72921ed5ac405c029ae33727467d7c5 Mon Sep 17 00:00:00 2001 |
| michael@0 | 2 | From: George Wright <gwright@mozilla.com> |
| michael@0 | 3 | Date: Fri, 18 May 2012 14:15:50 -0400 |
| michael@0 | 4 | Subject: [PATCH 05/10] Bug 755869 - [8] Re-apply bug 731384 - Fix compile |
| michael@0 | 5 | errors on older versions of clang r=mattwoodrow |
| michael@0 | 6 | |
| michael@0 | 7 | --- |
| michael@0 | 8 | gfx/skia/include/core/SkPostConfig.h | 9 +++++++++ |
| michael@0 | 9 | 1 files changed, 9 insertions(+), 0 deletions(-) |
| michael@0 | 10 | |
| michael@0 | 11 | diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h |
| michael@0 | 12 | index 8316f7a..041fe2a 100644 |
| michael@0 | 13 | --- a/gfx/skia/include/core/SkPostConfig.h |
| michael@0 | 14 | +++ b/gfx/skia/include/core/SkPostConfig.h |
| michael@0 | 15 | @@ -288,9 +288,18 @@ |
| michael@0 | 16 | #if defined(_MSC_VER) |
| michael@0 | 17 | #define SK_OVERRIDE override |
| michael@0 | 18 | #elif defined(__clang__) |
| michael@0 | 19 | +#if __has_feature(cxx_override_control) |
| michael@0 | 20 | // Some documentation suggests we should be using __attribute__((override)), |
| michael@0 | 21 | // but it doesn't work. |
| michael@0 | 22 | #define SK_OVERRIDE override |
| michael@0 | 23 | +#elif defined(__has_extension) |
| michael@0 | 24 | +#if __has_extension(cxx_override_control) |
| michael@0 | 25 | +#define SK_OVERRIDE override |
| michael@0 | 26 | +#endif |
| michael@0 | 27 | +#endif |
| michael@0 | 28 | +#ifndef SK_OVERRIDE |
| michael@0 | 29 | +#define SK_OVERRIDE |
| michael@0 | 30 | +#endif |
| michael@0 | 31 | #else |
| michael@0 | 32 | // Linux GCC ignores "__attribute__((override))" and rejects "override". |
| michael@0 | 33 | #define SK_OVERRIDE |
| michael@0 | 34 | -- |
| michael@0 | 35 | 1.7.5.4 |
| michael@0 | 36 |
