Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
This CL updates src/third_party/protobuf as follows:
  from: protocolbuffers/protobuf@c44ca26
    to: protocolbuffers/protobuf@92a7e77

BUG=
TEST=runtests
  • Loading branch information
yukawa committed Dec 31, 2017
1 parent e24eb2f commit 821b020
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/data/version/mozc_version_template.bzl
Expand Up @@ -30,7 +30,7 @@

MAJOR=2
MINOR=23
BUILD=2780
BUILD=2781
REVISION=102
# This version represents the version of Mozc IME engine (converter, predictor,
# etc.). This version info is included both in the Mozc server and in the Mozc
Expand Down
18 changes: 18 additions & 0 deletions src/protobuf/protobuf.gyp
Expand Up @@ -52,6 +52,18 @@
'4800',
],

# We accept following warnings come from protobuf header files.
# This list should be revised when protobuf is updated.
'msvc_disabled_warnings_for_proto_headers': [
# unary minus operator applied to unsigned type, result still unsigned.
# http://msdn.microsoft.com/en-us/library/4kh09110.aspx
'4146',
# 'type' : forcing value to bool 'true' or 'false'
# (performance warning)
# http://msdn.microsoft.com/en-us/library/b6801kcy.aspx
'4800',
],

'protobuf_prebuilt_jar_path': '',

'protobuf_cpp_root': '<(protobuf_root)/src/google/protobuf',
Expand All @@ -70,6 +82,7 @@
'<(protobuf_cpp_root)/extension_set_heavy.cc',
'<(protobuf_cpp_root)/generated_message_reflection.cc',
'<(protobuf_cpp_root)/generated_message_util.cc',
'<(protobuf_cpp_root)/implicit_weak_message.cc',
'<(protobuf_cpp_root)/io/coded_stream.cc',
'<(protobuf_cpp_root)/io/gzip_stream.cc',
'<(protobuf_cpp_root)/io/printer.cc',
Expand All @@ -95,6 +108,7 @@
'<(protobuf_cpp_root)/stubs/structurally_valid.cc',
'<(protobuf_cpp_root)/stubs/strutil.cc',
'<(protobuf_cpp_root)/stubs/substitute.cc',
'<(protobuf_cpp_root)/stubs/io_win32.cc',
'<(protobuf_cpp_root)/text_format.cc',
'<(protobuf_cpp_root)/unknown_field_set.cc',
'<(protobuf_cpp_root)/wire_format.cc',
Expand All @@ -117,6 +131,7 @@
'<(protobuf_cpp_root)/compiler/cpp/cpp_map_field.cc',
'<(protobuf_cpp_root)/compiler/cpp/cpp_message.cc',
'<(protobuf_cpp_root)/compiler/cpp/cpp_message_field.cc',
'<(protobuf_cpp_root)/compiler/cpp/cpp_padding_optimizer.cc',
'<(protobuf_cpp_root)/compiler/cpp/cpp_primitive_field.cc',
'<(protobuf_cpp_root)/compiler/cpp/cpp_service.cc',
'<(protobuf_cpp_root)/compiler/cpp/cpp_string_field.cc',
Expand Down Expand Up @@ -198,6 +213,9 @@
'include_dirs': [
'<(protobuf_root)/src',
],
'msvs_disabled_warnings': [
'<@(msvc_disabled_warnings_for_proto_headers)',
],
},
'msvs_disabled_warnings': [
'<@(msvc_disabled_warnings_for_protoc)',
Expand Down
2 changes: 1 addition & 1 deletion src/third_party/protobuf

0 comments on commit 821b020

Please sign in to comment.