diff options
author | Brian Salomon <bsalomon@google.com> | 2017-03-22 12:05:03 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-22 16:06:18 +0000 |
commit | d3b65972aad96453ff4510caa3e25a2b847c6d1e (patch) | |
tree | b79341c2266afe3b529aa1f4cd80c97b9a9e71ae /gm | |
parent | 30a38ff737c61799b0f36d2e6ba412f7e612f617 (diff) |
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>
Diffstat (limited to 'gm')
-rw-r--r-- | gm/giantbitmap.cpp | 2 | ||||
-rw-r--r-- | gm/image.cpp | 2 | ||||
-rw-r--r-- | gm/multipicturedraw.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gm/giantbitmap.cpp b/gm/giantbitmap.cpp index e1ba737d2f..37b76a64ab 100644 --- a/gm/giantbitmap.cpp +++ b/gm/giantbitmap.cpp @@ -66,7 +66,7 @@ public: fDoRotate = doRotate; } - virtual ~GiantBitmapGM() { delete fBM; } + ~GiantBitmapGM() override { delete fBM; } protected: diff --git a/gm/image.cpp b/gm/image.cpp index 43e3a0bd21..f672e07ed1 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -114,7 +114,7 @@ public: fSize.set(SkIntToScalar(W), SkIntToScalar(H)); } - virtual ~ImageGM() { + ~ImageGM() override { sk_free(fBuffer); } diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index 35f4c12986..e7d4baabef 100644 --- a/gm/multipicturedraw.cpp +++ b/gm/multipicturedraw.cpp @@ -470,7 +470,7 @@ namespace skiagm { } } - virtual ~MultiPictureDraw() { + ~MultiPictureDraw() override { for (int i = 0; i < kNumPictures; ++i) { SkSafeUnref(fPictures[i]); } |