Commit Graph

5476 Commits

Author SHA1 Message Date
Jisi Liu
4880027649 Cat the test-suite.log on errors for presubits 2018-03-19 16:13:36 -07:00
Adam Cozzette
ab95b1bc1e
Merge pull request #4371 from Rasrack/gnuc_minor
Fix spelling error of __GNUC_MINOR__
2018-03-15 22:58:20 -07:00
Thomas Van Lenten
aae10ed36d
Merge pull request #4370 from felixjendrusch/objc-output-stream-write-check
Objective-C: Check return value on write of raw pointer
2018-03-14 17:23:10 -04:00
Feng Xiao
813848d19d
Merge pull request #4222 from JohnHBrock/increasing_max_csharp_message_size
Remove 64MB memory limit when deserializing messages in C#
2018-03-14 13:25:19 -07:00
Feng Xiao
d5f5725c0a
Merge pull request #4310 from KindDragon/patch-1
Support using MSVC intrinsics in Log2FloorNonZero
2018-03-14 13:22:01 -07:00
Adam Cozzette
89b5333ad0
Merge pull request #4378 from acozzette/node-buffer
Revert "Removed mention of Buffer in byteSourceToUint8Array"
2018-03-13 15:53:47 -07:00
Joshua Haberman
4f110257c5
Merge pull request #4167 from mike9005/patch-1
Ruby: Fix scope resolution for MessageExts
2018-03-13 13:46:01 -07:00
Jisi Liu
5487d8ca0f
Merge pull request #4380 from mateuszmatejczyk/patch-1
Output *_pb2_grpc.py files when use_grpc_plugin=True
2018-03-12 15:27:10 -07:00
Jisi Liu
478751903a
Merge pull request #1333 from cgull/pkg-config-issue
Replace ancient m4/acx_pthread.m4 with m4/ax_pthread.m4
2018-03-12 14:13:13 -07:00
Mateusz Matejczyk
294b5758c3
Output *_pb2_grpc.py when use_grpc_plugin=True
Start outputting missing *_pb2_grpc.py files when  use_grpc_plugin is set to True for py_proto_library.
2018-03-11 17:48:10 -04:00
Adam Aili
0e34c86ed2 Fix spelling error of __GNUC_MINOR__ 2018-03-10 07:48:27 +01:00
Adam Cozzette
f8005a5d5a Revert "Removed mention of Buffer in byteSourceToUint8Array"
This reverts commit f00e06c95b.

Although Node Buffers are not covered by the tests, it seems that there
are users relying on them, so we need to add back in support for them.

This fixes issue #4359.
2018-03-09 15:08:52 -08:00
Feng Xiao
8e44a86fac
Merge pull request #4347 from xfxyjwf/pluginpb
Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."
2018-03-09 10:50:23 -08:00
Feng Xiao
6ebfa148a4
Merge pull request #4375 from jo2y/protoc-default
Replace //:protoc and similar default macro arguments with
2018-03-09 10:49:37 -08:00
James O'Kane
950f5e4205 Replace //:protoc and similar default macro arguments with
@com_google_protobuf prefixed versions. This allows them to work in 3rd party
repositories.

Fix a bad visibility rule. :hidden does not exist, but :private does.
2018-03-08 22:30:44 -08:00
Paul Yang
6dd563a674
Sync upb change (#4373) 2018-03-08 17:35:22 -08:00
Felix Jendrusch
1da9ffe394 Check return value on write of raw pointer 2018-03-08 16:20:37 +01:00
Felix Jendrusch
38508e9bbb Add test for failing write of raw pointer to output stream 2018-03-08 16:20:05 +01:00
Paul Yang
a48d58df96
Convert descriptortype to type for upb_msgval_sizeof (#4357) 2018-03-06 15:07:05 -08:00
Paul Yang
0f4ad85740
For encoding upb needs descriptor type instead of type. (#4354) 2018-03-06 13:30:03 -08:00
Adam Cozzette
55d07586e9
Merge pull request #4355 from acozzette/typo
PHP: fixed typo in message.c
2018-03-05 15:39:08 -08:00
Adam Cozzette
5004d09ff0 PHP: fixed typo in message.c 2018-03-05 14:25:42 -08:00
Feng Xiao
fd595fcc93 Revert "Move compiler/plugin.pb.cc to libprotobuf with the other WKT sources."
This reverts commit 724f0be33d.
2018-03-01 16:36:05 -08:00
Feng Xiao
9dc0a4d5cf
Merge pull request #4183 from pcc/win-libcxx
Add support for libc++ on Windows.
2018-02-26 15:07:55 -08:00
Feng Xiao
325ecff086
Merge pull request #4333 from jmillikin/update-file-lists-needs-bash
`update_file_lists.sh` depends on Bash features, thus needs Bash sebang.
2018-02-26 12:18:48 -08:00
Feng Xiao
32db4d375f
Merge pull request #4334 from jmillikin/blacklist-internal-proto-srcs
Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation.
2018-02-26 10:45:14 -08:00
Feng Xiao
3aaed9698d
Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJson
Adds an option in C++ JSON parser to ignore unrecognized enum values
2018-02-26 10:42:31 -08:00
Jisi Liu
bb40c0c0c4
Merge pull request #4291 from google/3.5.x
Merge 3.5.x to master
2018-02-26 10:05:09 -08:00
John Millikin
350b135e23 Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation.
This prevents the Bazel `CcProtoAspect` from generating and linking
C++ object code for these files. Without this blacklist, symbols for
protobuf types depended on by `libprotobuf` may be defined multiple
times and violate the ODR rule.

Fixes https://github.com/google/protobuf/issues/4311
2018-02-24 11:36:49 -08:00
John Millikin
724f0be33d Move compiler/plugin.pb.cc to libprotobuf with the other WKT sources.
This lets all values of `WELL_KNOWN_PROTOS` be treated the same with
regard to Bazel's protobuf blacklisting.
2018-02-24 11:34:40 -08:00
John Millikin
2e4c52a096 update_file_lists.sh depends on Bash features, thus needs Bash sebang.
I noticed that running this script as `./update_file_lists.sh` on MacOS
was corrupting `cmake/extract_includes.bat.in`. Forcing the shell to
Bash fixes the generated file output.
2018-02-24 11:30:10 -08:00
Feng Xiao
a6037c5230
Merge pull request #4324 from abdul-sami/master
Added instruction for existing ZLIB configuration
2018-02-22 15:33:27 -08:00
Abdul Sami
ac021a02a6
Merge pull request #1 from abdul-sami/abdul-sami-patch-1
Added instruction for existing ZLIB configuration
2018-02-21 12:18:37 +05:00
Abdul Sami
fe33c5fe9d
Added instruction for existing ZLIB configuration
Using two configuration flags `DZLIB_INCLUDE_DIR` and `DZLIB_LIB` we can locate an existing ZLIB on the system
2018-02-21 12:17:55 +05:00
Feng Xiao
177108aa8a
Merge pull request #4323 from dtapuska/master
Rename a shadowed variable.
2018-02-20 14:49:34 -08:00
Dave Tapuska
af3813cd73 Rename a shadowed variable.
Shadowed variables can cause readability issues. Ensure a shadowed
variable isn't used in header files which may be used in a dependent
project that explicitly disables them.
2018-02-20 17:16:33 -05:00
Feng Xiao
0475607fd6
Merge pull request #3186 from gkelly/remove-unused-variable
Remove unused output_file variable from js_embed
2018-02-20 13:11:45 -08:00
Arkady Shapkin
22c477d910 Support using MSVC intrinsics in Log2FloorNonZero 2018-02-15 02:37:42 +03:00
Alexey Malov
02452db725 The JsonParseOptions::ignore_unknown_fields option behavior treats
unrecognized string values in enum fields as default ones.
2018-02-12 14:07:40 +03:00
Jie Luo
e34ec6077a
Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262)
* Cython's stack does not have .py file name. Only check filenames when end with .py for _CalledFromGeneratedFile()
2018-02-09 15:54:03 -08:00
Yilun Chong
96b535cc2f
Merge pull request #4302 from BSBandme/down_integ_benchmark
Sync internal benchmark changes
2018-02-09 12:36:35 -08:00
Yilun Chong
6cd4ec4972 Sync internal benchmark changes 2018-02-09 11:47:00 -08:00
Thomas Van Lenten
4da7706d74 Remove stray indent on normal imports. 2018-02-08 15:51:17 -05:00
Feng Xiao
b8e47830d4
Merge pull request #4288 from nico/nofall
Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.
2018-02-08 10:53:41 -08:00
Thomas Van Lenten
07f023188e Fix up the docs to mention the WKTs generated files also.
Fixes #4277
2018-02-07 10:41:21 -05:00
Nico Weber
c66dd6c276 Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.
Chrome is running into two issues with the use of this macro
in open-source protobuf (https://crbug.com/809157):

1. GOOGLE_FALLTHROUGH_INTENDED is defined to nothing on __APPLE__
   platforms, which blocks us from enabling -Wimplicit-fallthrough
   on Mac and iOS. (We use a hermetic self-built modern clang,
   so whatever Xcode bug that exclusion might be for doesn't apply
   to us.)

2. It's in a public header file, and it's included in a public header file.
   When clang suggests adding [[clang::fallthrough]], it checks if it knows of
   a macro expanding to that and if so, suggests inserting that. Since lots of
   chrome code includes protobuf headers, it often suggests inserting
   GOOGLE_FALLTHROUGH_INTENDED (from protobuf) instead of the correct
   FALLTHROUGH (from chrome's base).

Since the fallthrough doens't do anyting useful, just remove it.
Long ago, this might have had perf impact, but d64a2d9941 added a
parsing fast path that calls this switch as slow fallback, so it should
be off the hot path nowadays.

No intended behavior change.

This is the public version of internal change 184824132.
2018-02-07 08:55:36 -05:00
Feng Xiao
82e0231607
Merge pull request #4259 from Mizux/master
Various CMake Update
2018-02-02 11:47:31 -08:00
Feng Xiao
5dad7cce19
Merge pull request #4257 from davido/support_java9
Bazel: Support building with Java 9
2018-02-01 15:11:56 -08:00
Yilun Chong
9717d6fa17
Merge pull request #4265 from BSBandme/upgrade_benchmark_submodule
Upgrade benchmark submodule
2018-02-01 13:50:45 -08:00
Corentin Le Molgat
1ec9beb477 Use NEW behaviour for project VERSION variables.
cf https://cmake.org/cmake/help/latest/policy/CMP0048.html#policy:CMP0048
2018-02-01 20:31:50 +01:00