| Index: include/core/SkImageInfo.h
|
| diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
|
| index 7b48c3a43007911b45dd34aad666ef5eba3ec44e..0218a7431094048107d9817270124ce7a16fb83b 100644
|
| --- a/include/core/SkImageInfo.h
|
| +++ b/include/core/SkImageInfo.h
|
| @@ -112,8 +112,8 @@ static int SkColorTypeBytesPerPixel(SkColorType ct) {
|
| 1, // kIndex_8
|
| 1, // kGray_8
|
| };
|
| - SK_COMPILE_ASSERT(SK_ARRAY_COUNT(gSize) == (size_t)(kLastEnum_SkColorType + 1),
|
| - size_mismatch_with_SkColorType_enum);
|
| + static_assert(SK_ARRAY_COUNT(gSize) == (size_t)(kLastEnum_SkColorType + 1),
|
| + "size_mismatch_with_SkColorType_enum");
|
|
|
| SkASSERT((size_t)ct < SK_ARRAY_COUNT(gSize));
|
| return gSize[ct];
|
|
|