| Index: src/sfnt/SkOTTableTypes.h
|
| diff --git a/src/sfnt/SkOTTableTypes.h b/src/sfnt/SkOTTableTypes.h
|
| index fa76b207ea0f9a4cccd90dfdbf5d1184bef882d7..119f17ef77c96a82dc9ef82aed8aa5a7296ffa49 100644
|
| --- a/src/sfnt/SkOTTableTypes.h
|
| +++ b/src/sfnt/SkOTTableTypes.h
|
| @@ -47,14 +47,14 @@ public:
|
|
|
| /** SkOTSetUSHORTBit<N>::value is an SK_OT_USHORT with the Nth BE bit set. */
|
| template <unsigned N> struct SkOTSetUSHORTBit {
|
| - SK_COMPILE_ASSERT(N < 16, NTooBig);
|
| + static_assert(N < 16, "NTooBig");
|
| static const uint16_t bit = 1u << N;
|
| static const SK_OT_USHORT value = SkTEndian_SwapBE16(bit);
|
| };
|
|
|
| /** SkOTSetULONGBit<N>::value is an SK_OT_ULONG with the Nth BE bit set. */
|
| template <unsigned N> struct SkOTSetULONGBit {
|
| - SK_COMPILE_ASSERT(N < 32, NTooBig);
|
| + static_assert(N < 32, "NTooBig");
|
| static const uint32_t bit = 1u << N;
|
| static const SK_OT_ULONG value = SkTEndian_SwapBE32(bit);
|
| };
|
|
|