Revert "Add extra warnings to match what Android uses."
This reverts commit d234662df1ffeb1bf45b2ade16c4acfb94f89450.
This change broke the build. Will resubmit after fixing warnings.
git-svn-id: http://skia.googlecode.com/svn/trunk/src@12311 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/animator/SkScriptCallBack.h b/animator/SkScriptCallBack.h
index fefc482..dcbaf11 100644
--- a/animator/SkScriptCallBack.h
+++ b/animator/SkScriptCallBack.h
@@ -13,8 +13,6 @@
class SkScriptCallBack {
public:
- virtual ~SkScriptCallBack() { }
-
enum Type {
kBox,
kFunction,
diff --git a/core/SkBuffer.h b/core/SkBuffer.h
index 9791cf5..369d9c0 100644
--- a/core/SkBuffer.h
+++ b/core/SkBuffer.h
@@ -39,8 +39,6 @@
fStop = (const char*)data + size;
}
- virtual ~SkRBuffer() { }
-
/** Return the number of bytes that have been read from the beginning
of the data pointer.
*/
diff --git a/gpu/gl/GrGLProgramEffects.h b/gpu/gl/GrGLProgramEffects.h
index 3320891..4572a42 100644
--- a/gpu/gl/GrGLProgramEffects.h
+++ b/gpu/gl/GrGLProgramEffects.h
@@ -129,8 +129,6 @@
*/
class GrGLProgramEffectsBuilder {
public:
- virtual ~GrGLProgramEffectsBuilder() { }
-
/**
* Emits the effect's shader code, and stores the necessary uniforms internally.
*/
@@ -213,7 +211,6 @@
class GrGLVertexProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
public:
GrGLVertexProgramEffectsBuilder(GrGLFullShaderBuilder*, int reserveCount);
- virtual ~GrGLVertexProgramEffectsBuilder() { }
virtual void emitEffect(const GrEffectStage&,
GrGLProgramEffects::EffectKey,
@@ -301,7 +298,6 @@
class GrGLTexGenProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
public:
GrGLTexGenProgramEffectsBuilder(GrGLFragmentOnlyShaderBuilder*, int reserveCount);
- virtual ~GrGLTexGenProgramEffectsBuilder() { }
virtual void emitEffect(const GrEffectStage&,
GrGLProgramEffects::EffectKey,
