diff options
Diffstat (limited to 'src/gpu/effects/GrDisableColorXP.h')
| -rw-r--r-- | src/gpu/effects/GrDisableColorXP.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gpu/effects/GrDisableColorXP.h b/src/gpu/effects/GrDisableColorXP.h index f1ac32bb4f..0c4f5cf2bb 100644 --- a/src/gpu/effects/GrDisableColorXP.h +++ b/src/gpu/effects/GrDisableColorXP.h @@ -13,10 +13,14 @@ #include "SkRefCnt.h" // See the comment above GrXPFactory's definition about this warning suppression. -#if defined(__GNUC__) || defined(__clang) +#if defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #endif +#if defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wnon-virtual-dtor" +#endif class GrDisableColorXPFactory : public GrXPFactory { public: static const GrXPFactory* Get(); @@ -42,9 +46,12 @@ private: typedef GrXPFactory INHERITED; }; -#if defined(__GNUC__) || defined(__clang) +#if defined(__GNUC__) #pragma GCC diagnostic pop #endif +#if defined(__clang__) +#pragma clang diagnostic pop +#endif inline const GrXPFactory* GrDisableColorXPFactory::Get() { // If this is constructed as static constexpr by cl.exe (2015 SP2) the vtable is null. |