| commit | 9daa4b92d73a1ae441c864a0ae73dda6c3397acb | [log] [tgz] |
|---|---|---|
| author | bsalomon <bsalomon@google.com> | Mon May 09 09:14:36 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Mon May 09 09:14:36 2016 -0700 |
| tree | a353cef40d9d4254da6076213641612b818be6e1 | |
| parent | 97a23369f870cc9a52ebe94c5d7d7bf443c9716d [diff] [blame] |
No error if function marked with SK_WARN_UNUSED_RESULT is used in SkAssertResult GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1955263002 Review-Url: https://codereview.chromium.org/1955263002
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index f99bb01..b44df0d 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h
@@ -148,8 +148,9 @@ #define SkDECLAREPARAM(type, var) #define SkPARAM(var) - // unlike SkASSERT, this guy executes its condition in the non-debug build - #define SkAssertResult(cond) cond + // unlike SkASSERT, this guy executes its condition in the non-debug build. + // It casts to void to allow use with functions declared with SK_WARN_RESULT_UNUSED. + #define SkAssertResult(cond) (void)(cond) #endif // Legacy macro names for SK_ABORT