diff options
author | Mike Klein <mtklein@chromium.org> | 2016-09-27 09:34:10 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-09-27 14:04:26 +0000 |
commit | fc6c37b981daeece7474ce61070c707c37eefa62 (patch) | |
tree | f805d76deeddc4a70a07126e0e78354ff4929258 /tests | |
parent | 9766f0016669029fcdc49f00ceaaf66b01b03f4a (diff) |
Remove stray semicolons.
Turns out function declarations don't end in semicolons...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2720
No public API changes.
TBR=reed@google.com
Change-Id: I72b56d52e1ff7fa6e89c295b0de8c46599791ebb
Reviewed-on: https://skia-review.googlesource.com/2720
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/FontMgrTest.cpp | 6 | ||||
-rw-r--r-- | tests/GrMemoryPoolTest.cpp | 12 | ||||
-rw-r--r-- | tests/GrPorterDuffTest.cpp | 2 | ||||
-rw-r--r-- | tests/GrShapeTest.cpp | 2 | ||||
-rw-r--r-- | tests/LayerRasterizerTest.cpp | 2 | ||||
-rw-r--r-- | tests/PrimitiveProcessorTest.cpp | 2 | ||||
-rw-r--r-- | tests/QuickRejectTest.cpp | 2 | ||||
-rw-r--r-- | tests/RefCntTest.cpp | 2 | ||||
-rw-r--r-- | tests/TypefaceTest.cpp | 6 |
9 files changed, 18 insertions, 18 deletions
diff --git a/tests/FontMgrTest.cpp b/tests/FontMgrTest.cpp index da72542f7c..c8c8b94cff 100644 --- a/tests/FontMgrTest.cpp +++ b/tests/FontMgrTest.cpp @@ -138,8 +138,8 @@ static void test_matchStyleCSS3(skiatest::Reporter* reporter) { } return 0; } - int onCountGlyphs() const override { return 0; }; - int onGetUPEM() const override { return 0; }; + int onCountGlyphs() const override { return 0; } + int onGetUPEM() const override { return 0; } class EmptyLocalizedStrings : public SkTypeface::LocalizedStrings { public: bool next(SkTypeface::LocalizedString*) override { return false; } @@ -149,7 +149,7 @@ static void test_matchStyleCSS3(skiatest::Reporter* reporter) { } SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override { return new EmptyLocalizedStrings; - }; + } int onGetTableTags(SkFontTableTag tags[]) const override { return 0; } size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const override { return 0; diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp index 1aecce328c..4a0a4c6eca 100644 --- a/tests/GrMemoryPoolTest.cpp +++ b/tests/GrMemoryPoolTest.cpp @@ -18,14 +18,14 @@ // that can be set and checked. class A { public: - A() {}; + A() {} virtual void setValues(int v) { fChar = static_cast<char>(v); } virtual bool checkValues(int v) { return fChar == static_cast<char>(v); } - virtual ~A() {}; + virtual ~A() {} void* operator new(size_t size) { if (!gPool.get()) { @@ -63,7 +63,7 @@ SkAutoTDelete<GrMemoryPool> A::gPool; class B : public A { public: - B() {}; + B() {} virtual void setValues(int v) { fDouble = static_cast<double>(v); this->INHERITED::setValues(v); @@ -72,7 +72,7 @@ public: return fDouble == static_cast<double>(v) && this->INHERITED::checkValues(v); } - virtual ~B() {}; + virtual ~B() {} private: double fDouble; @@ -82,7 +82,7 @@ private: class C : public A { public: - C() {}; + C() {} virtual void setValues(int v) { fInt64 = static_cast<int64_t>(v); this->INHERITED::setValues(v); @@ -91,7 +91,7 @@ public: return fInt64 == static_cast<int64_t>(v) && this->INHERITED::checkValues(v); } - virtual ~C() {}; + virtual ~C() {} private: int64_t fInt64; diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index 71db9939b8..845dae16e4 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -1108,7 +1108,7 @@ static void test_lcd_coverage_fallback_case(skiatest::Reporter* reporter, const const char* name() const override { return "Test LCD Text Batch"; } void initBatchTracker(const GrXPOverridesForBatch&) override {} bool onCombineIfPossible(GrBatch*, const GrCaps&) override { return false; } - void onPrepareDraws(Target*) const override {}; + void onPrepareDraws(Target*) const override {} typedef GrVertexBatch INHERITED; } testLCDCoverageBatch; diff --git a/tests/GrShapeTest.cpp b/tests/GrShapeTest.cpp index ae96c7d7dd..fc426857e1 100644 --- a/tests/GrShapeTest.cpp +++ b/tests/GrShapeTest.cpp @@ -84,7 +84,7 @@ namespace { */ class Geo { public: - virtual ~Geo() {}; + virtual ~Geo() {} virtual GrShape makeShape(const SkPaint&) const = 0; virtual SkPath path() const = 0; // These functions allow tests to check for special cases where style gets diff --git a/tests/LayerRasterizerTest.cpp b/tests/LayerRasterizerTest.cpp index 9d1fb2937a..dcbfdd1520 100644 --- a/tests/LayerRasterizerTest.cpp +++ b/tests/LayerRasterizerTest.cpp @@ -33,7 +33,7 @@ public: static int GetCount() { return gCount; } - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(DummyRasterizer); + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(DummyRasterizer) private: static int gCount; diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp index fc53f1886d..9ca6575a72 100644 --- a/tests/PrimitiveProcessorTest.cpp +++ b/tests/PrimitiveProcessorTest.cpp @@ -58,7 +58,7 @@ private: for (auto i = 0; i < numAttribs; ++i) { this->addVertexAttrib(fAttribNames[i].c_str(), kVec2f_GrVertexAttribType); } - }; + } const char* name() const override { return "Dummy GP"; } GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps&) const override { diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp index 8f6556bcd6..452aa8b742 100644 --- a/tests/QuickRejectTest.cpp +++ b/tests/QuickRejectTest.cpp @@ -29,7 +29,7 @@ public: } #endif - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestLooper); + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestLooper) private: class TestDrawLooperContext : public SkDrawLooper::Context { diff --git a/tests/RefCntTest.cpp b/tests/RefCntTest.cpp index 36915932b3..d5be62170b 100644 --- a/tests/RefCntTest.cpp +++ b/tests/RefCntTest.cpp @@ -334,7 +334,7 @@ DEF_TEST(sk_sp, reporter) { struct StructB : public SkRefCnt { sk_sp<StructA> a; - ~StructB() override {}; // Some clang versions don't emit this implicitly. + ~StructB() override {} // Some clang versions don't emit this implicitly. }; // Create a reference cycle. diff --git a/tests/TypefaceTest.cpp b/tests/TypefaceTest.cpp index 436f129a63..2a3b32d2cf 100644 --- a/tests/TypefaceTest.cpp +++ b/tests/TypefaceTest.cpp @@ -127,13 +127,13 @@ protected: SK_ABORT("unimplemented"); return 0; } - int onCountGlyphs() const override { return 0; }; - int onGetUPEM() const override { return 0; }; + int onCountGlyphs() const override { return 0; } + int onGetUPEM() const override { return 0; } void onGetFamilyName(SkString* familyName) const override { familyName->reset(); } SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override { SK_ABORT("unimplemented"); return nullptr; - }; + } int onGetTableTags(SkFontTableTag tags[]) const override { return 0; } size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const override { return 0; } }; |