Commit Graph

4462 Commits

Author SHA1 Message Date
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
Joshua Haberman
43f2db776c Merge pull request #2843 from haberman/check
Replace CHECK() with GOOGLE_CHECK().
2017-03-14 12:10:23 -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
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
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
Jisi Liu
81fe52fbd4 Fix java code according to error prone. 2017-03-10 14:53:15 -08:00
Paul Yang
616e68ecc1 Repeated/Map field setter should accept a regular PHP array (#2817)
Accept regular PHP array for repeated/map setter. Existing map/repeated
field will be swapped by a clean map/repeated field. Then, elements in
the array will be added to the map/repeated field. All elements will be
type checked before adding.

See #2686 for detail.
2017-03-10 13:42:59 -08:00
Jie Luo
ae220cda61 Add auto detect for generated code of WKT protos, addressbook.proto and conformance.proto 2017-03-10 10:44:20 -08:00
Feng Xiao
03c8c8be6d Update comments for setSizeLimit. 2017-03-09 17:24:42 -08:00
Jisi Liu
a1bb147e96 Merge pull request #2825 from pherl/javawarning
Cherry-pick changes from javalite branch to also fix Java warnings in the master branch
2017-03-09 17:13:55 -08:00
Feng Xiao
1ece7c09af Add missing thread dependency in cmake. 2017-03-09 17:02:17 -08:00
Jisi Liu
009e491bd7 Fix GeneratedMessageV3 warnings. 2017-03-09 16:56:18 -08:00
Feng Xiao
da003550e8 Merge pull request #2809 from xfxyjwf/i2464
Make JsonFormat locale independent.
2017-03-09 16:38:59 -08:00
Feng Xiao
61e87f3d41 Use per-type table to lookup JSON name.
Different fields from different messages can map to the same JSON name
and the original global lookup table is only capable of mapping one of
such fields. This change converts the global table to per-type tables
so fields from different messages won't conflict.
2017-03-09 16:30:15 -08:00
Jisi Liu
7c7534413a Fix lint warnings in the javalite branch. 2017-03-09 16:26:55 -08:00
Joshua Haberman
cad6a51a30 Merge pull request #2819 from haberman/pythonexcept
update_failure_list.py: fixed Python "raise" statement.
2017-03-09 14:58:01 -08:00
Josh Haberman
3e6245e5d7 update_failure_list.py: fixed Python "raise" statement. 2017-03-09 14:48:28 -08:00
Feng Xiao
075475f834 Don't expose gson exceptions in JsonFormat. 2017-03-09 14:42:45 -08:00
Adam Cozzette
bbfb9d52da Merge pull request #2804 from acozzette/ruby-memcpy
Ruby: wrap calls to memcpy so that gem is compatible with pre-2.14 glibc
2017-03-09 14:30:50 -08:00
Feng Xiao
8e465dcf46 Merge pull request #2810 from xfxyjwf/i1994
Avoid redundant type casts for oneof bytes fields.
2017-03-09 13:57:34 -08:00
Feng Xiao
af2d5f5ad3 Merge pull request #2775 from xfxyjwf/fixmajor
Undef major/minor if they are defined as macro.
2017-03-09 13:50:31 -08:00
Jisi Liu
9afacb44a3 Merge pull request #2814 from pherl/javadeprecate
Add annotations for deprecated messages in Java
2017-03-09 13:50:19 -08:00
Jisi Liu
baceff7c9c Add annotations for deprecated messages in Java 2017-03-09 11:51:58 -08:00
Adam Cozzette
9fa40314fc Ruby: wrap calls to memcpy so that gem is compatible with pre-2.14 glibc
This commit adds a __wrap_memcpy function and a linker flag to use that
in place of memcpy for our Ruby gem C extension. This allows us to
always use the 2.2.5 version of memcpy, making it possible to use the
gem on distributions with pre-2.14 versions of glibc.

Before this change:
$ objdump -T protobuf_c.so | grep memcpy
0000000000000000      DF *UND*  0000000000000000  GLIBC_2.3.4 __memcpy_chk
0000000000000000      DF *UND*  0000000000000000  GLIBC_2.14  memcpy

After:
$ objdump -T protobuf_c.so | grep memcpy
0000000000000000      DF *UND*  0000000000000000  GLIBC_2.2.5 memcpy
0000000000000000      DF *UND*  0000000000000000  GLIBC_2.3.4 __memcpy_chk
0000000000042450 g    DF .text  0000000000000005  Base __wrap_memcpy

This is based on gRPC's solution to a similar problem:
5098508d2d/src/core/lib/support/wrap_memcpy.c

This fixes issue #2783.
2017-03-09 10:03:22 -08:00
Feng Xiao
c31154316b Avoid redundant type casts for oneof bytes fields. 2017-03-08 17:34:38 -08:00
Feng Xiao
4ae8656b6d Make JsonFormat locale independent. 2017-03-08 16:56:43 -08:00
Feng Xiao
fa1788026c Merge pull request #2602 from GreatFruitOmsk/issue-2428
Method Builder#clone() has been changed to bypass Java 1.6 compiler issue.
2017-03-08 15:28:34 -08:00
Jie Luo
920af75d1c Fix Bad Link for Common Lisp 2017-03-08 15:24:04 -08:00
Paul Yang
dd8d5f57d7 Rename encode/decode to serializeToString/mergeFromString (#2795)
This better shows the semantic of the API. For already setted fields,
mergeFromString do replacement for singular fields and appending for
repeated fields.
2017-03-08 14:31:34 -08:00
Feng Xiao
2b7430d96a Merge pull request #2793 from keveman/master
Removed a stray return statement, causing compilation error.
2017-03-07 14:22:57 -08:00
Jisi Liu
f6d8c83384 Merge pull request #2613 from aausch/fix_memory_leak
optimization and quick workaround to memory leak
2017-03-06 16:48:54 -08:00
Manjunath Kudlur
21b58b51fe Removed a stray return statement, causing compilation error. 2017-03-06 15:50:26 -08:00
Jie Luo
06f9f609e1 Detect if Descriptor.cs changes for csharp
Merge pull request #2788 from anandolee/master
2017-03-06 15:33:41 -08:00
Feng Xiao
0c0a8879c3 Merge pull request #2751 from keveman/master
Added a header only cc_library target for the protobuf library.
2017-03-06 10:41:19 -08:00
Adam Cozzette
008ff033ef Merge pull request #2784 from acozzette/log-2-floor-int
Return uint32 from Log2FloorNonZero64
2017-03-03 07:06:15 -08:00
Manjunath Kudlur
6837b2dcb7 Added comment explaining the protobuf_headers target. 2017-03-02 18:02:05 -08:00
Jie Luo
af13bff3c7 Detect if Descriptor.cs changes for csharp 2017-03-02 17:15:58 -08:00
Feng Xiao
8610d0a9dd Merge pull request #2755 from xfxyjwf/rubycomp
Add Ruby compatibilty test against 3.0.0.
2017-03-02 14:33:02 -08:00
Thomas Van Lenten
352526c214 Merge pull request #2785 from thomasvl/threading_race
Handing threading race resolving methods.
2017-03-02 17:14:52 -05:00
Thomas Van Lenten
2d1c5e26cb Handing threading race resolving methods.
- Don't prune the extension registry as that can lead to failures when two
  threads are racing.
- If adding the method fails, check and see if it already is bound to decide
  the return result. Deals with threading races binding the methods.
2017-03-02 16:34:11 -05:00
Adam Cozzette
938206d66c Return uint32 from Log2FloorNonZero64
A uint32 is big enough to hold any return value from that function, and
doing it this way prevents compiler warnings in coded_stream.h about
narrowing a uint64 to a uint32.
2017-03-02 11:31:38 -08:00
Adam Cozzette
a7e3b0ab01 Merge pull request #2774 from acozzette/closure-builder
Use closurebuilder.py in favor of calcdeps.py for compiling JavaScript
2017-03-02 08:47:20 -08:00