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 /src/core/SkTextFormatParams.h | |
| 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 'src/core/SkTextFormatParams.h')
| -rw-r--r-- | src/core/SkTextFormatParams.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/SkTextFormatParams.h b/src/core/SkTextFormatParams.h index dac4aefd62..f41c4de1d5 100644 --- a/src/core/SkTextFormatParams.h +++ b/src/core/SkTextFormatParams.h @@ -30,12 +30,10 @@ static const SkScalar kStdFakeBoldInterpKeys[] = { }; static const SkScalar kStdFakeBoldInterpValues[] = { SK_Scalar1/24, - SK_Scalar1/32 + SK_Scalar1/32, }; -SK_COMPILE_ASSERT(SK_ARRAY_COUNT(kStdFakeBoldInterpKeys) == - SK_ARRAY_COUNT(kStdFakeBoldInterpValues), - mismatched_array_size); -static const int kStdFakeBoldInterpLength = - SK_ARRAY_COUNT(kStdFakeBoldInterpKeys); +static_assert(SK_ARRAY_COUNT(kStdFakeBoldInterpKeys) == SK_ARRAY_COUNT(kStdFakeBoldInterpValues), + "mismatched_array_size"); +static const int kStdFakeBoldInterpLength = SK_ARRAY_COUNT(kStdFakeBoldInterpKeys); #endif //SkTextFormatParams_DEFINES |