| Index: src/core/SkTextBlob.cpp
|
| diff --git a/src/core/SkTextBlob.cpp b/src/core/SkTextBlob.cpp
|
| index d1a77e74f7efdcc831a6768f8314abc426e9e4e1..d2b1605e95bef33af8c7d6a121009bfc705d8ea9 100644
|
| --- a/src/core/SkTextBlob.cpp
|
| +++ b/src/core/SkTextBlob.cpp
|
| @@ -73,9 +73,9 @@ private:
|
| SkAutoTUnref<SkTypeface> fTypeface;
|
| SkScalar fSkewX;
|
|
|
| - SK_COMPILE_ASSERT(SkPaint::kFull_Hinting < 4, insufficient_hinting_bits);
|
| + static_assert(SkPaint::kFull_Hinting < 4, "insufficient_hinting_bits");
|
| uint32_t fHinting : 2;
|
| - SK_COMPILE_ASSERT((kFlagsMask & 0xffff) == kFlagsMask, insufficient_flags_bits);
|
| + static_assert((kFlagsMask & 0xffff) == kFlagsMask, "insufficient_flags_bits");
|
| uint32_t fFlags : 16;
|
|
|
| typedef SkNoncopyable INHERITED;
|
| @@ -87,7 +87,7 @@ struct RunFontStorageEquivalent {
|
| SkScalar fSkewX;
|
| uint32_t fFlags;
|
| };
|
| -SK_COMPILE_ASSERT(sizeof(RunFont) == sizeof(RunFontStorageEquivalent), runfont_should_stay_packed);
|
| +static_assert(sizeof(RunFont) == sizeof(RunFontStorageEquivalent), "runfont_should_stay_packed");
|
|
|
| } // anonymous namespace
|
|
|
|
|