diff options
| -rw-r--r-- | gyp/common_conditions.gypi | 3 | ||||
| -rw-r--r-- | src/record/SkRecord.h | 2 | ||||
| -rw-r--r-- | src/record/SkRecords.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 39512a81cd..8498fe3b35 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -21,6 +21,9 @@ '_CRT_SECURE_NO_WARNINGS', 'GR_GL_FUNCTION_TYPE=__stdcall', ], + 'msvs_disabled_warnings': [ + 4345, # This is an FYI about a behavior change from long ago. Chrome stifles it too. + ], 'msvs_cygwin_shell': 0, 'msvs_settings': { 'VCCLCompilerTool': { diff --git a/src/record/SkRecord.h b/src/record/SkRecord.h index ccfa1dd556..068155e47f 100644 --- a/src/record/SkRecord.h +++ b/src/record/SkRecord.h @@ -167,7 +167,7 @@ private: // We could just return NULL but it's sort of confusing to return NULL on success. template <typename T> SK_WHEN(SkTIsEmpty<T>, T*) allocCommand() { - static T singleton; + static T singleton = {}; return &singleton; } diff --git a/src/record/SkRecords.h b/src/record/SkRecords.h index bfa15496f3..d4b6852d70 100644 --- a/src/record/SkRecords.h +++ b/src/record/SkRecords.h @@ -63,7 +63,6 @@ enum Type { SK_RECORD_TYPES(ENUM) }; #define RECORD0(T) \ struct T { \ static const Type kType = T##_Type; \ - T() {} \ }; // We try to be flexible about the types the constructors take. Instead of requring the exact type |