Add extra warnings to match what Android uses.

R=mtklein@google.com

Committed: https://code.google.com/p/skia/source/detail?r=12310

Review URL: https://codereview.chromium.org/74193005

git-svn-id: http://skia.googlecode.com/svn/trunk@12314 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
mtklein@google.com 2013-11-20 15:13:49 +00:00
Родитель f7159bba8e
Коммит f1077f9164
6 изменённых файлов: 30 добавлений и 23 удалений

Просмотреть файл

@ -149,6 +149,22 @@
# The following section is common to linux + derivatives and android # The following section is common to linux + derivatives and android
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]',
{ {
'cflags': [
'-fno-exceptions',
'-fstrict-aliasing',
'-Wall',
'-Wextra',
'-Winit-self',
'-Wpointer-arith',
'-Wno-unused-parameter',
'-Wno-c++11-extensions',
],
'cflags_cc': [
'-fno-rtti',
'-Wnon-virtual-dtor',
],
'conditions': [ 'conditions': [
[ 'skia_warnings_as_errors', { [ 'skia_warnings_as_errors', {
'cflags': [ 'cflags': [
@ -229,13 +245,6 @@
'defines': [ 'NDEBUG' ], 'defines': [ 'NDEBUG' ],
}, },
}, },
'cflags': [
'-Wall',
'-Wextra',
# suppressions below here were added for clang
'-Wno-unused-parameter',
'-Wno-c++11-extensions',
],
'conditions' : [ 'conditions' : [
[ 'skia_shared_lib', { [ 'skia_shared_lib', {
'cflags': [ 'cflags': [
@ -474,14 +483,8 @@
'-llog', '-llog',
], ],
'cflags': [ 'cflags': [
'-Wall',
'-fno-exceptions',
'-fstrict-aliasing',
'-fuse-ld=gold', '-fuse-ld=gold',
], ],
'cflags_cc': [
'-fno-rtti',
],
'conditions': [ 'conditions': [
[ 'skia_shared_lib', { [ 'skia_shared_lib', {
'cflags': [ 'cflags': [

Просмотреть файл

@ -129,6 +129,9 @@
'cflags': [ 'cflags': [
'-w' '-w'
], ],
'cflags_cc!': [
'-fno-rtti'
],
'conditions': [ 'conditions': [
['skia_os == "linux"', { ['skia_os == "linux"', {
'include_dirs': [ 'include_dirs': [

Просмотреть файл

@ -42,9 +42,7 @@
'../third_party/externals/expat/lib', '../third_party/externals/expat/lib',
], ],
'cflags': [ 'cflags': [
'-Wall', '-w',
'-Wmissing-prototypes',
'-Wstrict-prototypes',
'-fexceptions', '-fexceptions',
'-DHAVE_EXPAT_CONFIG_H', '-DHAVE_EXPAT_CONFIG_H',
], ],
@ -66,12 +64,9 @@
'../third_party/externals/gif', '../third_party/externals/gif',
], ],
'cflags': [ 'cflags': [
'-Wno-format', '-w',
'-DHAVE_CONFIG_H', '-DHAVE_CONFIG_H',
], ],
'cflags!': [
'-Wall',
],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
'../third_party/externals/gif', '../third_party/externals/gif',
@ -104,11 +99,9 @@
'../third_party/externals/png', '../third_party/externals/png',
], ],
'cflags': [ 'cflags': [
'-w',
'-fvisibility=hidden', '-fvisibility=hidden',
], ],
'cflags!': [
'-Wall',
],
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'-lz', '-lz',

Просмотреть файл

@ -13,6 +13,8 @@
class SkScriptCallBack { class SkScriptCallBack {
public: public:
virtual ~SkScriptCallBack() { }
enum Type { enum Type {
kBox, kBox,
kFunction, kFunction,

Просмотреть файл

@ -39,6 +39,8 @@ public:
fStop = (const char*)data + size; fStop = (const char*)data + size;
} }
virtual ~SkRBuffer() { }
/** Return the number of bytes that have been read from the beginning /** Return the number of bytes that have been read from the beginning
of the data pointer. of the data pointer.
*/ */

Просмотреть файл

@ -129,6 +129,8 @@ protected:
*/ */
class GrGLProgramEffectsBuilder { class GrGLProgramEffectsBuilder {
public: public:
virtual ~GrGLProgramEffectsBuilder() { }
/** /**
* Emits the effect's shader code, and stores the necessary uniforms internally. * Emits the effect's shader code, and stores the necessary uniforms internally.
*/ */
@ -211,6 +213,7 @@ private:
class GrGLVertexProgramEffectsBuilder : public GrGLProgramEffectsBuilder { class GrGLVertexProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
public: public:
GrGLVertexProgramEffectsBuilder(GrGLFullShaderBuilder*, int reserveCount); GrGLVertexProgramEffectsBuilder(GrGLFullShaderBuilder*, int reserveCount);
virtual ~GrGLVertexProgramEffectsBuilder() { }
virtual void emitEffect(const GrEffectStage&, virtual void emitEffect(const GrEffectStage&,
GrGLProgramEffects::EffectKey, GrGLProgramEffects::EffectKey,
@ -298,6 +301,7 @@ private:
class GrGLTexGenProgramEffectsBuilder : public GrGLProgramEffectsBuilder { class GrGLTexGenProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
public: public:
GrGLTexGenProgramEffectsBuilder(GrGLFragmentOnlyShaderBuilder*, int reserveCount); GrGLTexGenProgramEffectsBuilder(GrGLFragmentOnlyShaderBuilder*, int reserveCount);
virtual ~GrGLTexGenProgramEffectsBuilder() { }
virtual void emitEffect(const GrEffectStage&, virtual void emitEffect(const GrEffectStage&,
GrGLProgramEffects::EffectKey, GrGLProgramEffects::EffectKey,