| Index: include/core/SkPath.h
|
| diff --git a/include/core/SkPath.h b/include/core/SkPath.h
|
| index dc50ae76c317b1ad487da5470ecb6f73c7698bf6..caf4cfe5ecc9aa0e4e189c96153ea3c8d0f4ff54 100644
|
| --- a/include/core/SkPath.h
|
| +++ b/include/core/SkPath.h
|
| @@ -505,10 +505,10 @@ public:
|
| * kInverseEvenOdd_FillType -> true
|
| */
|
| static bool IsInverseFillType(FillType fill) {
|
| - SK_COMPILE_ASSERT(0 == kWinding_FillType, fill_type_mismatch);
|
| - SK_COMPILE_ASSERT(1 == kEvenOdd_FillType, fill_type_mismatch);
|
| - SK_COMPILE_ASSERT(2 == kInverseWinding_FillType, fill_type_mismatch);
|
| - SK_COMPILE_ASSERT(3 == kInverseEvenOdd_FillType, fill_type_mismatch);
|
| + static_assert(0 == kWinding_FillType, "fill_type_mismatch");
|
| + static_assert(1 == kEvenOdd_FillType, "fill_type_mismatch");
|
| + static_assert(2 == kInverseWinding_FillType, "fill_type_mismatch");
|
| + static_assert(3 == kInverseEvenOdd_FillType, "fill_type_mismatch");
|
| return (fill & 2) != 0;
|
| }
|
|
|
| @@ -521,10 +521,10 @@ public:
|
| * kInverseEvenOdd_FillType -> kEvenOdd_FillType
|
| */
|
| static FillType ConvertToNonInverseFillType(FillType fill) {
|
| - SK_COMPILE_ASSERT(0 == kWinding_FillType, fill_type_mismatch);
|
| - SK_COMPILE_ASSERT(1 == kEvenOdd_FillType, fill_type_mismatch);
|
| - SK_COMPILE_ASSERT(2 == kInverseWinding_FillType, fill_type_mismatch);
|
| - SK_COMPILE_ASSERT(3 == kInverseEvenOdd_FillType, fill_type_mismatch);
|
| + static_assert(0 == kWinding_FillType, "fill_type_mismatch");
|
| + static_assert(1 == kEvenOdd_FillType, "fill_type_mismatch");
|
| + static_assert(2 == kInverseWinding_FillType, "fill_type_mismatch");
|
| + static_assert(3 == kInverseEvenOdd_FillType, "fill_type_mismatch");
|
| return (FillType)(fill & 1);
|
| }
|
|
|
|
|