Commit Graph

4705 Commits

Author SHA1 Message Date
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
Ewout
aec0711075 Ruby tests compare parsed JSON instead of raw JSON 2017-03-17 10:28:17 +01: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
Konstantin Podsvirov
97cbc42621 Fix libprotoc.cmake to generate well_known_types_embed.cc
Unfortunate typo. Just one extra ',' symbol, has led to the hidden implicit behavior.

Now everything will be fine.
2017-03-15 14:16:49 -07:00
Paul Yang
f23869c615 Bug fix: When encoding, negative int32 values should be padded to int64 (#2660)
in order to be wire compatible.
2017-03-15 14:16:49 -07:00
Josh Haberman
014a5507fb Ruby: build packages for Ruby 2.4. 2017-03-15 14:16:49 -07:00
Adam Cozzette
c57c77b4b7 Merge pull request #2829 from afrantzis/hide-unnecessary-library-symbols
Hide unnecessary exported library symbols
2017-03-15 11:41:14 -07:00
Josh Haberman
324a299a55 Made formatting more consistent. 2017-03-15 10:35:15 -07:00
Adam Cozzette
ed0ef54045 Merge pull request #2846 from acozzette/bytestream-comment
Updated an outdated comment in bytestream.h
2017-03-15 09:13:44 -07:00
Thomas Van Lenten
d18df81488 Merge pull request #2855 from thomasvl/copy_note
Document deep copy in the header
2017-03-15 11:07:05 -04:00
Thomas Van Lenten
5e4f14fae4 Document deep copy in the header 2017-03-15 10:50:31 -04:00
Markus Heß
b4b855cde4 fix attributes warning 2017-03-15 15:20:54 +01:00
Feng Xiao
416f90939d Fix freebsd build.
It turns out system headers included by generated plugin.pb.h file already contains
major/minor macro definitions when built on FreeBSD and we need to add #undefs to
the generated header file.

This change also fixes another compile error regarding EXPECT_DEATH on FreeBSD.
2017-03-14 23:41:54 +00:00
Josh Haberman
9c6b8cb9bf Ruby: fixed Message#to_h for map fields. 2017-03-14 14:27:16 -07:00
Josh Haberman
95b4427d39 Build system fixes for JS conformance tests. 2017-03-14 12:45:57 -07:00
Joshua Haberman
43f2db776c Merge pull request #2843 from haberman/check
Replace CHECK() with GOOGLE_CHECK().
2017-03-14 12:10:23 -07:00
Adam Cozzette
746ca59885 Updated an outdated comment in bytestream.h 2017-03-14 10:08:36 -07:00
Josh Haberman
874e382fde Replace CHECK() with GOOGLE_CHECK().
Fixes: https://github.com/google/protobuf/issues/1175
2017-03-13 16:07:42 -07:00
Josh Haberman
8df69f0894 Conformance test for JS now work, though 15 tests fail. 2017-03-13 15:10:53 -07:00
Feng Xiao
f0a5c1033a Merge pull request #2836 from xfxyjwf/i894
Double-quote file paths in extract_includes.bat.in
2017-03-13 15:03:50 -07:00
Jisi Liu
ddfc86b1f7 Merge pull request #2835 from pherl/javaep
Suppress the last unchecked warning.
2017-03-13 10:56:20 -07:00
Alexandros Frantzis
13d165de9e Hide unnecessary exported library symbols 2017-03-13 14:27:39 +02:00
Jie Luo
d59592af61 DefaultValueObjectWriter should populate oneof message field 2017-03-10 16:58:20 -08:00
Feng Xiao
c94555f955 Double-quote file paths in extract_includes.bat.in
This allows the file path to contain spaces which is very common on
windows.
2017-03-10 16:32:19 -08:00
Jisi Liu
f4f31e73f2 Suppress the last unchecked warning.
Likely to be java language issue. Varargs are considered arrays, thus
using generic with varargs will cause unchecked warning about generic
array creation.
2017-03-10 15:33:17 -08:00
Jie Luo
a69bc9de75 Merge pull request #2822 from anandolee/master
Detect generated code of WKT, addressbook and conformance protos
2017-03-10 15:24:51 -08:00
Jisi Liu
f54fb9d729 Merge pull request #2832 from pherl/javaep
Fix java code according to error prone.
2017-03-10 15:19:04 -08:00
Feng Xiao
e11cd3ee6e Merge pull request #2818 from xfxyjwf/i1470
Don't expose gson exceptions in JsonFormat.
2017-03-10 15:08:51 -08:00
Feng Xiao
92064a40ce Merge pull request #2824 from xfxyjwf/i1415
Use per-type table to lookup JSON name.
2017-03-10 15:03:29 -08:00
Feng Xiao
cd6eb91684 Merge pull request #2826 from xfxyjwf/i1374
Add missing thread dependency in cmake.
2017-03-10 15:03:15 -08:00
Feng Xiao
81f4fe5aab Merge pull request #2827 from xfxyjwf/i1251
Update comments for setSizeLimit.
2017-03-10 15:02:52 -08:00