commit 99fe82260633fcf5d92cca38d12ef0937ecca61c
author bungeman <bungeman@google.com> Thu Aug 20 07:57:51 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 20 07:57:52 2015 -0700
tree 258dedccd2b908de58f6b1ae7c67dbfbe7208866
parent 915881fe743f9a789037695f543bc6ea189cd0cb

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

src/core/SkTextFormatParams.h

diff --git a/src/core/SkTextFormatParams.h b/src/core/SkTextFormatParams.h
index dac4aef..f41c4de 100644
--- a/src/core/SkTextFormatParams.h
+++ b/src/core/SkTextFormatParams.h
@@ -30,12 +30,10 @@
 };
 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