Suppress compiler warnings for Protocol Buffers 2.6.1
This is a follow up CL for r438, which also brought few new compiler warnings. With this CL, all of them are now suppressed.
This is just an update of compiler warning settings. Hence no behvior change in production is intended.
BUG=none
TEST=unittest
git-svn-id: https://mozc.googlecode.com/svn/trunk@444 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index db8b5a1..402b9a4 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=16
-BUILD=1983
+BUILD=1984
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.
diff --git a/src/protobuf/protobuf.gyp b/src/protobuf/protobuf.gyp
index 4ec8579..0d5f1be 100644
--- a/src/protobuf/protobuf.gyp
+++ b/src/protobuf/protobuf.gyp
@@ -32,12 +32,18 @@
# We accept following warnings come from protobuf.
# This list should be revised when protobuf is updated.
'msvc_disabled_warnings_for_protoc': [
+ # 'witch statement contains 'default' but no 'case' labels
+ # http://msdn.microsoft.com/en-us/library/te26h1tz.aspx
+ '4065',
# unary minus operator applied to unsigned type, result still unsigned.
# http://msdn.microsoft.com/en-us/library/4kh09110.aspx
'4146',
# 'this' : used in base member initializer list
# http://msdn.microsoft.com/en-us/library/3c594ae3.aspx
'4355',
+ # 'function' : not all control paths return a value
+ # http://msdn.microsoft.com/en-us/library/6deaf4k9.aspx
+ '4715',
# 'type' : forcing value to bool 'true' or 'false'
# (performance warning)
# http://msdn.microsoft.com/en-us/library/b6801kcy.aspx
@@ -166,6 +172,8 @@
'(_toolset=="host" and (compiler_host=="clang" or compiler_host=="gcc"))', {
'cflags': [
'-Wno-conversion-null', # coded_stream.cc uses NULL to bool.
+ '-Wno-maybe-uninitialized',
+ '-Wno-return-type',
'-Wno-unused-function',
# For sizeof_uint64_is_not_sizeof_long_long in stubs/strutil.h
# TODO(komatsu): Update the following two lines when we stop
