| Index: src/ports/SkFontMgr_android_parser.h
|
| diff --git a/src/ports/SkFontMgr_android_parser.h b/src/ports/SkFontMgr_android_parser.h
|
| index 175a6fa1fe7b8584daaa12dd90fdc2bfd9fb2386..ca66c43410b43a1394eb3f7ca4ee9d112186c4c9 100644
|
| --- a/src/ports/SkFontMgr_android_parser.h
|
| +++ b/src/ports/SkFontMgr_android_parser.h
|
| @@ -126,7 +126,7 @@ void GetCustomFontFamilies(SkTDArray<FontFamily*>& fontFamilies,
|
| * If the string cannot be parsed into 'value', returns false and does not change 'value'.
|
| */
|
| template <typename T> static bool parse_non_negative_integer(const char* s, T* value) {
|
| - SK_COMPILE_ASSERT(std::numeric_limits<T>::is_integer, T_must_be_integer);
|
| + static_assert(std::numeric_limits<T>::is_integer, "T_must_be_integer");
|
|
|
| if (*s == '\0') {
|
| return false;
|
| @@ -163,9 +163,9 @@ template <typename T> static bool parse_non_negative_integer(const char* s, T* v
|
| * If the string cannot be parsed into 'value', returns false and does not change 'value'.
|
| */
|
| template <int N, typename T> static bool parse_fixed(const char* s, T* value) {
|
| - SK_COMPILE_ASSERT(std::numeric_limits<T>::is_integer, T_must_be_integer);
|
| - SK_COMPILE_ASSERT(std::numeric_limits<T>::is_signed, T_must_be_signed);
|
| - SK_COMPILE_ASSERT(sizeof(T) * CHAR_BIT - N >= 5, N_must_leave_four_bits_plus_sign);
|
| + static_assert(std::numeric_limits<T>::is_integer, "T_must_be_integer");
|
| + static_assert(std::numeric_limits<T>::is_signed, "T_must_be_signed");
|
| + static_assert(sizeof(T) * CHAR_BIT - N >= 5, "N_must_leave_four_bits_plus_sign");
|
|
|
| bool negate = false;
|
| if (*s == '-') {
|
|
|