diff options
author | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-11 13:30:08 +0000 |
---|---|---|
committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-11 13:30:08 +0000 |
commit | 3a52d68b4001afd8c7036e80558fba7c87f45a0c (patch) | |
tree | f745e4285870b72162c168e7da3183af0253836e /include | |
parent | 22f0761d7879c108d305cb0d6cc0242ad29e780f (diff) |
Revert SkNO_RETURN_HINT fix in favor of a simpler fix
git-svn-id: http://skia.googlecode.com/svn/trunk@4529 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkPostConfig.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h index 6107faad4d..c5f4a37a55 100644 --- a/include/core/SkPostConfig.h +++ b/include/core/SkPostConfig.h @@ -64,10 +64,10 @@ */ #if !defined(SkNO_RETURN_HINT) #if SK_HAS_COMPILER_FEATURE(attribute_analyzer_noreturn) - // If we make this a static clang will complain that it isn't called in - // any file that has no asserts. - void SkNoReturnHint() __attribute__((analyzer_noreturn)); - #define SkNO_RETURN_HINT() SkNoReturnHint() + namespace { + inline void SkNO_RETURN_HINT() __attribute__((analyzer_noreturn)); + inline void SkNO_RETURN_HINT() {} + } #else #define SkNO_RETURN_HINT() do {} while (false) #endif |