wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 839347: Move SkNO_RETURN_HINT out of anonymous namespace so that clang won't warn about it being unused. r=mattwoodrow

Browse Source
This commit is contained in:
Daniel Holbert 2013-02-17 23:46:05 -08:00
parent ccea6f8d02
commit 1eae6b4255
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/skia/include/core/SkPostConfig.h
View File

@ -68,10 +68,8 @@
*/
#if !defined(SkNO_RETURN_HINT)
#if SK_HAS_COMPILER_FEATURE(attribute_analyzer_noreturn)
namespace {
inline void SkNO_RETURN_HINT() __attribute__((analyzer_noreturn));
inline void SkNO_RETURN_HINT() {}
}
inline void SkNO_RETURN_HINT() __attribute__((analyzer_noreturn));
inline void SkNO_RETURN_HINT() {}
#else
#define SkNO_RETURN_HINT() do {} while (false)
#endif

31
gfx/skia/patches/0011-Bug-839347-no-anon-namespace-around-SkNO_RETURN_HINT.patch Normal file
View File

@ -0,0 +1,31 @@
# HG changeset patch
# Parent 2c6da9f02606f7a02f635d99ef8cf669d3bc5c4b
# User Daniel Holbert <dholbert@cs.stanford.edu>
Bug 839347: Move SkNO_RETURN_HINT out of anonymous namespace so that clang won't warn about it being unused. r=mattwoodrow
diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h
--- a/gfx/skia/include/core/SkPostConfig.h
+++ b/gfx/skia/include/core/SkPostConfig.h
@@ -63,20 +63,18 @@
* The clang static analyzer likes to know that when the program is not
* expected to continue (crash, assertion failure, etc). It will notice that
* some combination of parameters lead to a function call that does not return.
* It can then make appropriate assumptions about the parameters in code
* executed only if the non-returning function was *not* called.
*/
#if !defined(SkNO_RETURN_HINT)
#if SK_HAS_COMPILER_FEATURE(attribute_analyzer_noreturn)
- namespace {
- inline void SkNO_RETURN_HINT() __attribute__((analyzer_noreturn));
- inline void SkNO_RETURN_HINT() {}
- }
+ inline void SkNO_RETURN_HINT() __attribute__((analyzer_noreturn));
+ inline void SkNO_RETURN_HINT() {}
#else
#define SkNO_RETURN_HINT() do {} while (false)
#endif
#endif
#if defined(SK_ZLIB_INCLUDE) && defined(SK_SYSTEM_ZLIB)
#error "cannot define both SK_ZLIB_INCLUDE and SK_SYSTEM_ZLIB"
#elif defined(SK_ZLIB_INCLUDE) || defined(SK_SYSTEM_ZLIB)

1
gfx/skia/patches/README
View File

@ -8,3 +8,4 @@ See the relevant bugs in bugzilla for information on these patches:
0005-Bug-777614-Re-apply-bug-687188-Expand-the-gradient-c.patch
0009-Bug-777614-Re-apply-759683-Handle-compilers-that-don.patch
0010-Bug-836892-Add-new-blending-modes-to-SkXfermode.patch
0011-Bug-839347-no-anon-namespace-around-SkNO_RETURN_HINT.patch