Index: src/gpu/GrBatchFontCache.h |
diff --git a/src/gpu/GrBatchFontCache.h b/src/gpu/GrBatchFontCache.h |
index fc2f3b7a29f413259a4792a4796384e6b2feb4ed..32c3281a711a49f5deb017d09a348896eb388f4d 100644 |
--- a/src/gpu/GrBatchFontCache.h |
+++ b/src/gpu/GrBatchFontCache.h |
@@ -179,7 +179,7 @@ private: |
kRGB_565_GrPixelConfig, |
kSkia8888_GrPixelConfig |
}; |
- SK_COMPILE_ASSERT(SK_ARRAY_COUNT(kPixelConfigs) == kMaskFormatCount, array_size_mismatch); |
+ static_assert(SK_ARRAY_COUNT(kPixelConfigs) == kMaskFormatCount, "array_size_mismatch"); |
return kPixelConfigs[format]; |
} |
@@ -191,7 +191,7 @@ private: |
kA565_GrMaskFormat, |
kARGB_GrMaskFormat, |
}; |
- SK_COMPILE_ASSERT(SK_ARRAY_COUNT(sAtlasIndices) == kMaskFormatCount, array_size_mismatch); |
+ static_assert(SK_ARRAY_COUNT(sAtlasIndices) == kMaskFormatCount, "array_size_mismatch"); |
SkASSERT(sAtlasIndices[format] < kMaskFormatCount); |
return sAtlasIndices[format]; |