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>
diff --git a/src/core/SkChunkAlloc.cpp b/src/core/SkChunkAlloc.cpp
index bb52c46..90650a7 100644
--- a/src/core/SkChunkAlloc.cpp
+++ b/src/core/SkChunkAlloc.cpp
@@ -45,7 +45,7 @@
sk_free(block);
block = next;
}
- };
+ }
bool contains(const void* addr) const {
const char* ptr = reinterpret_cast<const char*>(addr);
diff --git a/src/core/SkColorMatrixFilterRowMajor255.h b/src/core/SkColorMatrixFilterRowMajor255.h
index 79709b3..c115885 100644
--- a/src/core/SkColorMatrixFilterRowMajor255.h
+++ b/src/core/SkColorMatrixFilterRowMajor255.h
@@ -12,7 +12,7 @@
class SK_API SkColorMatrixFilterRowMajor255 : public SkColorFilter {
public:
- SkColorMatrixFilterRowMajor255() {};
+ SkColorMatrixFilterRowMajor255() {}
explicit SkColorMatrixFilterRowMajor255(const SkScalar array[20]);
/** Creates a color matrix filter that returns the same value in all four channels. */
diff --git a/src/core/SkFindAndPlaceGlyph.h b/src/core/SkFindAndPlaceGlyph.h
index 48cc0fa..257528c 100644
--- a/src/core/SkFindAndPlaceGlyph.h
+++ b/src/core/SkFindAndPlaceGlyph.h
@@ -405,7 +405,7 @@
template<typename ProcessOneGlyph>
class GlyphFindAndPlaceInterface : SkNoncopyable {
public:
- virtual ~GlyphFindAndPlaceInterface() { };
+ virtual ~GlyphFindAndPlaceInterface() { }
// findAndPositionGlyph calculates the position of the glyph, finds the glyph, and
// returns the position of where the next glyph will be using the glyph's advance and
@@ -419,7 +419,7 @@
const char** text, SkPoint position, ProcessOneGlyph&& processOneGlyph) {
SkFAIL("Should never get here.");
return {0.0f, 0.0f};
- };
+ }
};
// GlyphFindAndPlaceSubpixel handles finding and placing glyphs when sub-pixel positioning is
diff --git a/src/core/SkLinearBitmapPipeline.cpp b/src/core/SkLinearBitmapPipeline.cpp
index 44a3d77..401eb41 100644
--- a/src/core/SkLinearBitmapPipeline.cpp
+++ b/src/core/SkLinearBitmapPipeline.cpp
@@ -413,7 +413,7 @@
const uint32_t* src = this->pixelAddress(x, y);
SkOpts::srcover_srgb_srgb(fDest, src, 1, 1);
fDest += 1;
- };
+ }
const uint32_t* const fSrc;
const int32_t fWidth;
diff --git a/src/core/SkLinearBitmapPipeline_sample.h b/src/core/SkLinearBitmapPipeline_sample.h
index 78e8d67..5f9948c 100644
--- a/src/core/SkLinearBitmapPipeline_sample.h
+++ b/src/core/SkLinearBitmapPipeline_sample.h
@@ -207,7 +207,7 @@
void get4Pixels(
const void* src, int index, Sk4f* px0, Sk4f* px1, Sk4f* px2, Sk4f* px3) const {
fPixelAccessor->get4Pixels(src, index, px0, px1, px2, px3);
- };
+ }
Sk4f getPixelFromRow(const void* row, int index) const {
return fPixelAccessor->getPixelFromRow(row, index);
diff --git a/src/core/SkLinearBitmapPipeline_tile.h b/src/core/SkLinearBitmapPipeline_tile.h
index 39d79a0..1e07c22 100644
--- a/src/core/SkLinearBitmapPipeline_tile.h
+++ b/src/core/SkLinearBitmapPipeline_tile.h
@@ -410,7 +410,7 @@
SkScalar answer = SkMinScalar(SkScalarAbs(unbias), fYsCap[0]);
SkASSERT(0 <= answer && answer < fYMax);
return answer;
- };
+ }
private:
SkScalar fYMax;
diff --git a/src/core/SkModeColorFilter.h b/src/core/SkModeColorFilter.h
index 01d1eaa..7d4d4cc 100644
--- a/src/core/SkModeColorFilter.h
+++ b/src/core/SkModeColorFilter.h
@@ -45,7 +45,7 @@
fColor = color;
fMode = mode;
this->updateCache();
- };
+ }
void flatten(SkWriteBuffer&) const override;
diff --git a/src/core/SkNormalSource.h b/src/core/SkNormalSource.h
index 84aa9c4..32ef08c 100644
--- a/src/core/SkNormalSource.h
+++ b/src/core/SkNormalSource.h
@@ -33,7 +33,7 @@
class Provider {
public:
- virtual ~Provider() {};
+ virtual ~Provider() {}
/** Called for each span of the object being drawn on the CPU. Your subclass should set
the appropriate normals that correspond to the specified device coordinates.
diff --git a/src/core/SkRWBuffer.cpp b/src/core/SkRWBuffer.cpp
index 8f50c25..07a537a 100644
--- a/src/core/SkRWBuffer.cpp
+++ b/src/core/SkRWBuffer.cpp
@@ -19,7 +19,7 @@
SkBufferBlock(size_t capacity) : fNext(nullptr), fUsed(0), fCapacity(capacity) {}
- const void* startData() const { return this + 1; };
+ const void* startData() const { return this + 1; }
size_t avail() const { return fCapacity - fUsed; }
void* availData() { return (char*)this->startData() + fUsed; }
diff --git a/src/core/SkResourceCache.h b/src/core/SkResourceCache.h
index a8da4bd..5919336 100644
--- a/src/core/SkResourceCache.h
+++ b/src/core/SkResourceCache.h
@@ -243,7 +243,7 @@
}
DiscardableFactory discardableFactory() const { return fDiscardableFactory; }
- SkBitmap::Allocator* allocator() const { return fAllocator; };
+ SkBitmap::Allocator* allocator() const { return fAllocator; }
SkCachedData* newCachedData(size_t bytes);
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
index 3c4f5cb..8747c6e 100644
--- a/src/core/SkTypeface.cpp
+++ b/src/core/SkTypeface.cpp
@@ -61,8 +61,8 @@
}
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; }
@@ -72,7 +72,7 @@
}
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;