diff options
| author |  bungeman <bungeman@google.com> | 2015-08-20 07:57:51 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-20 07:57:52 -0700 |
| commit | 99fe82260633fcf5d92cca38d12ef0937ecca61c (patch) | |
| tree | 258dedccd2b908de58f6b1ae7c67dbfbe7208866 /gm/variedtext.cpp | |
| parent | 915881fe743f9a789037695f543bc6ea189cd0cb (diff) | |
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
Diffstat (limited to 'gm/variedtext.cpp')
| -rw-r--r-- | gm/variedtext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gm/variedtext.cpp b/gm/variedtext.cpp index 97b3f577e5..887a7c30d0 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); |