From 99fe82260633fcf5d92cca38d12ef0937ecca61c Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 20 Aug 2015 07:57:51 -0700 Subject: Use static_assert instead of SK_COMPILE_ASSERT. Now that static_assert is allowed, there is no need to use a non- standard compile time assertion Review URL: https://codereview.chromium.org/1306443004 --- include/private/SkRecords.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/private') diff --git a/include/private/SkRecords.h b/include/private/SkRecords.h index 1f2807842c..4268bb469c 100644 --- a/include/private/SkRecords.h +++ b/include/private/SkRecords.h @@ -247,7 +247,7 @@ struct RegionOpAndAA { SkRegion::Op op : 31; // This really only needs to be 3, but there's no win today to do so. unsigned aa : 1; // MSVC won't pack an enum with an bool, so we call this an unsigned. }; -SK_COMPILE_ASSERT(sizeof(RegionOpAndAA) == 4, RegionOpAndAASize); +static_assert(sizeof(RegionOpAndAA) == 4, "RegionOpAndAASize"); RECORD3(ClipPath, SkIRect, devBounds, PreCachedPath, path, RegionOpAndAA, opAA); RECORD3(ClipRRect, SkIRect, devBounds, SkRRect, rrect, RegionOpAndAA, opAA); -- cgit v1.2.3