commit d3b65972aad96453ff4510caa3e25a2b847c6d1e
author Brian Salomon <bsalomon@google.com> Wed Mar 22 12:05:03 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Mar 22 16:06:18 2017 +0000
tree b79341c2266afe3b529aa1f4cd80c97b9a9e71ae
parent 30a38ff737c61799b0f36d2e6ba412f7e612f617

Mark overridden destructors with 'override' and remove 'virtual'

This silences a new warning in clang 5.0

Change-Id: Ieb5b75a6ffed60107c3fd16075d2ecfd515b55e8
Reviewed-on: https://skia-review.googlesource.com/10006
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>

gm/giantbitmap.cpp

diff --git a/gm/giantbitmap.cpp b/gm/giantbitmap.cpp
index e1ba737..37b76a6 100644
--- a/gm/giantbitmap.cpp
+++ b/gm/giantbitmap.cpp
@@ -66,7 +66,7 @@
         fDoRotate = doRotate;
     }
 
-    virtual ~GiantBitmapGM() { delete fBM; }
+    ~GiantBitmapGM() override { delete fBM; }
 
 protected:
 

gm/image.cpp

diff --git a/gm/image.cpp b/gm/image.cpp
index 43e3a0b..f672e07 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -114,7 +114,7 @@
         fSize.set(SkIntToScalar(W), SkIntToScalar(H));
     }
 
-    virtual ~ImageGM() {
+    ~ImageGM() override {
         sk_free(fBuffer);
     }
 

gm/multipicturedraw.cpp

diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp
index 35f4c12..e7d4baa 100644
--- a/gm/multipicturedraw.cpp
+++ b/gm/multipicturedraw.cpp
@@ -470,7 +470,7 @@
             }
         }
 
-        virtual ~MultiPictureDraw() {
+        ~MultiPictureDraw() override {
             for (int i = 0; i < kNumPictures; ++i) {
                 SkSafeUnref(fPictures[i]);
             }