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 /src/ports/SkFontMgr_fontconfig.cpp | |
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 'src/ports/SkFontMgr_fontconfig.cpp')
-rw-r--r-- | src/ports/SkFontMgr_fontconfig.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp index 85230b394e..bceb4de3bd 100644 --- a/src/ports/SkFontMgr_fontconfig.cpp +++ b/src/ports/SkFontMgr_fontconfig.cpp @@ -503,7 +503,7 @@ public: return info; } - virtual ~SkTypeface_fontconfig() { + ~SkTypeface_fontconfig() override { // Hold the lock while unrefing the pattern. FCLocker lock; fPattern.reset(); @@ -534,7 +534,7 @@ class SkFontMgr_fontconfig : public SkFontMgr { : fFontMgr(SkRef(parent)), fFontSet(fontSet) { } - virtual ~StyleSet() { + ~StyleSet() override { // Hold the lock while unrefing the font set. FCLocker lock; fFontSet.reset(); @@ -667,7 +667,7 @@ public: : fFC(config ? config : FcInitLoadConfigAndFonts()) , fFamilyNames(GetFamilyNames(fFC)) { } - virtual ~SkFontMgr_fontconfig() { + ~SkFontMgr_fontconfig() override { // Hold the lock while unrefing the config. FCLocker lock; fFC.reset(); |