gm/variedtext.cpp - Issue 1306443004: Use static_assert instead of SK_COMPILE_ASSERT.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gm/variedtext.cpp

Issue 1306443004: Use static_assert instead of SK_COMPILE_ASSERT. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: gm/variedtext.cpp

diff --git a/gm/variedtext.cpp b/gm/variedtext.cpp

index 97b3f577e531fb9c649e6ee8d62a527fd93ff5e6..887a7c30d09f80af62193cf8e40d2bb225937d9f 100644

--- a/gm/variedtext.cpp

+++ b/gm/variedtext.cpp

@@ -58,7 +58,7 @@ protected:

SkScalar w = SkIntToScalar(size.fWidth);

SkScalar h = SkIntToScalar(size.fHeight);

- SK_COMPILE_ASSERT(4 == SK_ARRAY_COUNT(fTypefacesToUnref), typeface_cnt);

+ static_assert(4 == SK_ARRAY_COUNT(fTypefacesToUnref), "typeface_cnt");

fTypefacesToUnref[0] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kNormal);

fTypefacesToUnref[1] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kBold);

fTypefacesToUnref[2] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal);

« no previous file with comments | « gm/pixelsnap.cpp ('k') | include/core/SkImageInfo.h » ('j') | no next file with comments »