New versions of clang are different.
authorMatthew Leibowitz <mattleibow@live.com>
Mon, 30 Apr 2018 15:47:41 +0000 (17:47 +0200)
committerMatthew Leibowitz <mattleibow@live.com>
Mon, 30 Apr 2018 15:47:41 +0000 (17:47 +0200)
gn/BUILD.gn
src/gpu/GrBackendTextureImageGenerator.h

index 1e1c5e7..6a765c9 100644 (file)
@@ -372,6 +372,7 @@ config("warnings") {
 
       cflags += [
         "-Wno-cast-align",
+        "-Wno-cast-qual",
         "-Wno-conditional-uninitialized",
         "-Wno-conversion",
         "-Wno-disabled-macro-expansion",
@@ -399,6 +400,8 @@ config("warnings") {
         "-Wno-unreachable-code-return",
         "-Wno-unused-macros",
         "-Wno-unused-member-function",
+        "-Wno-unused-template",
+        "-Wno-zero-as-null-pointer-constant",
       ]
       cflags_cc += [
         "-Wno-abstract-vbase-init",
index 1a316d1..2ada687 100644 (file)
@@ -19,7 +19,7 @@ public:
     static std::unique_ptr<SkImageGenerator> Make(sk_sp<GrTexture>, sk_sp<GrSemaphore>,
                                                   SkAlphaType, sk_sp<SkColorSpace>);
 
-    ~GrBackendTextureImageGenerator();
+    ~GrBackendTextureImageGenerator() override;
 
 protected:
     // NOTE: We would like to validate that the owning context hasn't been abandoned, but we can't