AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
4,531 Commits 35 Branches 138 Tags 124 MiB
d36c0c538a
Commit Graph

4531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feng Xiao
d36c0c538a Down-integrate from google3. 2017-03-29 14:33:05 -07:00
Juan David Dominguez
4a0dd03e52 Removes ignored const from return type (#2915) 
See https://github.com/google/protobuf/issues/2425
 2017-03-29 11:39:29 -07:00
Thomas Van Lenten
258406b88f Merge pull request #2919 from thomasvl/drop_dispatch 
Remove the use of dispatch_once that is heap backed.
 2017-03-29 14:07:07 -04:00
Thomas Van Lenten
130c166697 Remove the use of dispatch_once that is heap backed. 
Apple recently updated the docs on dispatch_once to point out
that the storage for the dispatch_once_t must be static or global,
but not something that was ever used before as the implementation
doesn't use a memory barrier.  So we drop the use and create the
semaphore when needed and use an atomic swap deal with any
threading races.
 2017-03-29 13:03:33 -04:00
Thomas Van Lenten
ba3fa41ba8 Merge pull request #2918 from thomasvl/xcode_8_3 
Add support for Xcode 8.3 to the build helper.
 2017-03-29 11:03:30 -04:00
Thomas Van Lenten
558ba98811 Add support for Xcode 8.3 to the build helper. 2017-03-29 11:02:51 -04:00
Thomas Van Lenten
04c77c4e4b Merge pull request #2913 from thomasvl/conformance_ignores 
Add some new ignores for things generated in conformance.
 2017-03-29 09:44:59 -04:00
drivehappy
d43eaf2b8f Fix gcc warning when using map (#2213) 
* Issue #2211: Addressing GCC warning on enumeral/non-enumeral in conditional expression.

* Updated per 80 character wrap.
 2017-03-28 16:57:19 -07:00
Adam Cozzette
585993201a Merge pull request #2914 from acozzette/nacl 
Added a workaround to allow building for NaCl
 2017-03-28 13:54:50 -07:00
Adam Cozzette
f316375a95 Added a workaround to allow building for NaCl 
arm-nacl-clang seems to produce a mysterious compiler error when it
encounters __builtin_clzll, so when we are building for NaCl, let's
avoid that in favor of the portable implementation of
Log2FloorNonZero64.
 2017-03-28 09:45:14 -07:00
Thomas Van Lenten
8adf57e0fa Add some new ignores for things generated in conformance. 2017-03-28 11:04:58 -04:00
Thomas Van Lenten
b3f3e123aa Merge pull request #2912 from thomasvl/objc_recursion_limit 
Raise the recursion limit to 100 to match other languages.
 2017-03-28 09:18:14 -04:00
Thomas Van Lenten
ddb438855a Raise the recursion limit to 100 to match other languages. 2017-03-28 09:10:20 -04:00
Joshua Haberman
d9e0119f2c Merge pull request #2858 from haberman/gopackage 
Changed go_package for plugin.proto.
 2017-03-27 12:04:08 -07:00
Joshua Haberman
c565e25c7d Merge pull request #1662 from haberman/jsconformance 
Conformance tests for JavaScript (Node.js). 15 tests are failing.
 2017-03-27 12:03:09 -07:00
Jie Luo
7610f101e8 Merge pull request #2884 from anandolee/master 
Add FormatEnumsAsIntegers support for Json Format. Scale JsonFormatter.Settings for multi options.
 2017-03-27 11:05:38 -07:00
Jie Luo
689e4bf5f4 Add FormatEnumAsInt support for Json Format. And scale JsonFormatter.Settings to multiple options. 2017-03-24 12:05:52 -07:00
Feng Xiao
373809e5f5 Merge pull request #2897 from cgrushko/patch-5 
Compile the Java proto runtime with Java 6
 2017-03-22 13:35:52 -07:00
cgrushko
6f21e29268 Compile the Java proto runtime with Java 6 
in order to avoid errors related to generics when 
building user code in newer versions of Java.
 2017-03-22 14:27:51 -04:00
Paul Yang
1387a6795c Update commit number in Docker to update composer dependency (#2869) 2017-03-21 10:18:49 -07:00
Adam Cozzette
ffa932bf10 Merge pull request #2861 from byronyi/#710 
migrate delimited messages functions to util package
 2017-03-20 13:02:40 -07:00
Bairen Yi
312e2dbcfb Update BUILD 2017-03-21 03:52:37 +08:00
Feng Xiao
db3ef48ede Merge pull request #2860 from prehistoric-penguin/master 
Remove duplicated copyright statement
 2017-03-20 10:49:48 -07:00
Adam Cozzette
20181f6a1a Merge pull request #2854 from hesmar/attributesFix 
fix attributes warning
 2017-03-20 09:51:31 -07:00
Adam Cozzette
4d273f28dc Merge pull request #2870 from acozzette/memcpy-memmove 
Ruby: only link against specific version of memcpy if we're using glibc
 2017-03-20 08:26:06 -07:00
Feng Xiao
15b60bccf8 Merge pull request #2867 from mojoBrendan/master 
Add preserve_proto_field_names option to JsonPrintOptions
 2017-03-17 15:05:58 -07:00
Adam Cozzette
ea5ef14aa0 Ruby: only link against specific version of memcpy if we're using glibc 
We have some special code in wrap_memcpy.c to ensure that we use the
2.2.5 version of memcpy, for compatibility with older versions of glibc.
However, we need to make sure we only attempt to do this when we are
actually building with glibc, so that the code can also build
successfully against other libc implementations such as musl.
 2017-03-17 11:23:01 -07:00
Jie Luo
c12cc3490b Merge pull request #2837 from anandolee/master 
DefaultValueObjectWriter should populate oneof message field
 2017-03-17 11:10:24 -07:00
Paul Yang
6b27c1f981 Add file option php_class_prefix (#2849) 
This option will be prepended to generated classes of all messages in
the containing file.
 2017-03-17 11:08:06 -07:00
Feng Xiao
c0871aa49c Merge pull request #2848 from xfxyjwf/freebsd 
Fix freebsd build.
 2017-03-17 10:42:20 -07:00
Bairen Yi
e8e6aa2864 Update delimited_message_util_test.cc 2017-03-18 00:32:43 +08:00
Brendan McCarthy
89eb4e51b2 Add option to preserve original proto field names 2017-03-17 22:47:38 +10:00
Brendan McCarthy
1eee3202fc Add use_snake_case_for_field_names option to JsonPrintOptions 2017-03-17 18:46:18 +10:00
Byron Yi
c415a1445b fix several issues 2017-03-17 10:00:59 +08:00
Feng Xiao
44dc55587e Merge pull request #2866 from xfxyjwf/nano 
Add a notice for nano.
 2017-03-16 16:47:10 -07:00
Feng Xiao
ddc00963c0 Add a notice for nano. 
We no longer supports nano and recommend protobuf lite over nano for
Android users.
 2017-03-16 16:09:41 -07:00
Josh Haberman
1b0db1cb83 Removed obsolete comments and added docs. 2017-03-16 15:19:09 -07:00
Josh Haberman
0df20284d0 Properly regenerated descriptor.proto. 2017-03-16 15:07:22 -07:00
Joshua Haberman
89c3c456d2 Merge pull request #2859 from haberman/junit-dep-scope 
Changed scope of Java deps to "test".
 2017-03-16 12:25:42 -07:00
Joshua Haberman
2957703a01 Merge pull request #2847 from haberman/ruby-toh 
Ruby: fixed Message#to_h for map fields.
 2017-03-16 09:28:09 -07:00
Adam Cozzette
0fad0e138f Merge pull request #2794 from acozzette/jspb-extensions 
JS: ensure that extension values are serialized even if they're falsy
 2017-03-16 09:23:32 -07:00
Byron Yi
acaa9407e3 add delimited_message_util.cc to libprotobuf.cmake 2017-03-16 20:52:58 +08:00
Byron Yi
7008a88e2b add LIBPROTOBUF_EXPORT to make msvc happy 2017-03-16 20:35:35 +08:00
Byron Yi
cb3e84b78e migrate delimited messages functions to util package 2017-03-16 20:01:22 +08:00
prehistoric-penguin
33cc25f36c Remove duplicated copyright statement 2017-03-16 11:23:07 +08:00
Josh Haberman
496cd481fa Changed scope of Java deps to "test". 
This is per: https://github.com/google/protobuf/issues/2019
 2017-03-15 18:27:05 -07:00
Josh Haberman
e62e30c309 Changed go_package for plugin.proto. 
For more info see: https://github.com/google/protobuf/issues/1289
 2017-03-15 17:48:46 -07:00
Joshua Haberman
4842363ee6 Merge pull request #2023 from odeke-em/fix-print-help-to-stdout 
compiler/cli: PrintHelpText prints to stdout instead of stderr
 2017-03-15 14:45:03 -07:00
Adam Cozzette
e77a09e1e9 Incremented Ruby version number to 3.2.0.1 2017-03-15 14:16:49 -07:00
Josh Haberman
8c40b5149a Ruby: update Gemspec. 2017-03-15 14:16:49 -07:00