From 7a5bcc5f59bdf122217bc8ca7e756e8c76bae9e1 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Tue, 24 May 2016 13:23:56 -0700 Subject: [PATCH] Make Sk32ToBool inline again to silence compiler warning. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2007753003 Review-Url: https://codereview.chromium.org/2007753003 --- include/core/SkTypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index 13b662abf6..baa6ac14ae 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -369,7 +369,7 @@ typedef uint32_t SkMSec; /** Faster than SkToBool for integral conditions. Returns 0 or 1 */ -static constexpr int Sk32ToBool(uint32_t n) { +static inline constexpr int Sk32ToBool(uint32_t n) { return (n | (0-n)) >> 31; }