Index: include/gpu/GrTypes.h |
diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h |
index f51638887491389c3eaa6c6629153f90a5dfe2a3..ed4827d62765204439df80c01a72109abb29d474 100644 |
--- a/include/gpu/GrTypes.h |
+++ b/include/gpu/GrTypes.h |
@@ -185,10 +185,10 @@ static inline int GrMaskFormatBytesPerPixel(GrMaskFormat format) { |
// kA565 (1) -> 2 |
// kARGB (2) -> 4 |
static const int sBytesPerPixel[] = { 1, 2, 4 }; |
- SK_COMPILE_ASSERT(SK_ARRAY_COUNT(sBytesPerPixel) == kMaskFormatCount, array_size_mismatch); |
- SK_COMPILE_ASSERT(kA8_GrMaskFormat == 0, enum_order_dependency); |
- SK_COMPILE_ASSERT(kA565_GrMaskFormat == 1, enum_order_dependency); |
- SK_COMPILE_ASSERT(kARGB_GrMaskFormat == 2, enum_order_dependency); |
+ static_assert(SK_ARRAY_COUNT(sBytesPerPixel) == kMaskFormatCount, "array_size_mismatch"); |
+ static_assert(kA8_GrMaskFormat == 0, "enum_order_dependency"); |
+ static_assert(kA565_GrMaskFormat == 1, "enum_order_dependency"); |
+ static_assert(kARGB_GrMaskFormat == 2, "enum_order_dependency"); |
return sBytesPerPixel[(int) format]; |
} |