diff options
| -rw-r--r-- | include/core/SkPostConfig.h | 8 | ||||
| -rw-r--r-- | src/core/SkUtils.cpp | 5 |
2 files changed, 4 insertions, 9 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 diff --git a/src/core/SkUtils.cpp b/src/core/SkUtils.cpp index 2617120005..3f1c65e777 100644 --- a/src/core/SkUtils.cpp +++ b/src/core/SkUtils.cpp @@ -9,11 +9,6 @@ #include "SkUtils.h" -// declared in SkPostConfig.h, see comment there. -void SkNoReturnHint() {} - -/////////////////////////////////////////////////////////////////////////////// - #if 0 #define assign_16_longs(dst, value) \ do { \ |