diff options
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/convex_all_line_paths.cpp | 2 | ||||
| -rw-r--r-- | gm/pixelsnap.cpp | 2 | ||||
| -rw-r--r-- | gm/variedtext.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gm/convex_all_line_paths.cpp b/gm/convex_all_line_paths.cpp index a93a7f6e47..435a37a10a 100644 --- a/gm/convex_all_line_paths.cpp +++ b/gm/convex_all_line_paths.cpp @@ -163,7 +163,7 @@ protected: SK_ARRAY_COUNT(gPoints9), SK_ARRAY_COUNT(gPoints10), }; - SK_COMPILE_ASSERT(SK_ARRAY_COUNT(gSizes) == SK_ARRAY_COUNT(gPoints), array_mismatch); + static_assert(SK_ARRAY_COUNT(gSizes) == SK_ARRAY_COUNT(gPoints), "array_mismatch"); SkAutoTDeleteArray<SkPoint> data(NULL); const SkPoint* points; diff --git a/gm/pixelsnap.cpp b/gm/pixelsnap.cpp index 3358e9d410..ea85a948ac 100644 --- a/gm/pixelsnap.cpp +++ b/gm/pixelsnap.cpp @@ -23,7 +23,7 @@ protected: static const int kSubPixelSteps = 8; static const int kLabelTextSize = 9; - SK_COMPILE_ASSERT(kSubPixelSteps < 99, label_offset_too_small); + static_assert(kSubPixelSteps < 99, "label_offset_too_small"); static const int kLabelOffsetX = 2 * kLabelTextSize + kLabelPad; static const int kLabelOffsetY = kLabelTextSize + kLabelPad; 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); |