diff --git a/include/codec/SkCodecAnimation.h b/include/codec/SkCodecAnimation.h index 9a4daff8ae..2ddb78deb3 100644 --- a/include/codec/SkCodecAnimation.h +++ b/include/codec/SkCodecAnimation.h @@ -39,5 +39,5 @@ namespace SkCodecAnimation { */ kRestorePrevious = 3, }; -}; +} #endif // SkCodecAnimation_DEFINED diff --git a/include/encode/SkWebpEncoder.h b/include/encode/SkWebpEncoder.h index 8d5f4a6c75..d4e05350ac 100644 --- a/include/encode/SkWebpEncoder.h +++ b/include/encode/SkWebpEncoder.h @@ -43,6 +43,6 @@ namespace SkWebpEncoder { * Returns true on success. Returns false on an invalid or unsupported |src|. */ SK_API bool Encode(SkWStream* dst, const SkPixmap& src, const Options& options); -}; +} #endif diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h index 6082d97127..5005d57a4c 100644 --- a/include/gpu/GrTypes.h +++ b/include/gpu/GrTypes.h @@ -121,7 +121,7 @@ template inline TFlags& operator&=(TFlags& a, GrTFlagsMask operator ~(X); \ friend constexpr X operator |(X, X); \ friend X& operator |=(X&, X); \ - friend constexpr bool operator &(X, X); + friend constexpr bool operator &(X, X) //////////////////////////////////////////////////////////////////////////////// diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h index 06f14a781b..b310f36e2e 100644 --- a/include/private/GrTypesPriv.h +++ b/include/private/GrTypesPriv.h @@ -413,7 +413,7 @@ enum GrShaderFlags { kGeometry_GrShaderFlag = 1 << kGeometry_GrShaderType, kFragment_GrShaderFlag = 1 << kFragment_GrShaderType }; -GR_MAKE_BITFIELD_OPS(GrShaderFlags); +GR_MAKE_BITFIELD_OPS(GrShaderFlags) /** * Precisions of shader language variables. Not all shading languages support precisions or actually diff --git a/src/gpu/ops/GrAAFillRRectOp.h b/src/gpu/ops/GrAAFillRRectOp.h index cb29b91ad9..6e3d560f35 100644 --- a/src/gpu/ops/GrAAFillRRectOp.h +++ b/src/gpu/ops/GrAAFillRRectOp.h @@ -35,7 +35,7 @@ private: kHasLocalCoords = 1 << 1 }; - GR_DECL_BITFIELD_CLASS_OPS_FRIENDS(Flags) + GR_DECL_BITFIELD_CLASS_OPS_FRIENDS(Flags); class Processor;