aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2835 from pherl/javaepJisi Liu2017-03-131-0/+1
|\ | | | | Suppress the last unchecked warning.
| * Suppress the last unchecked warning.Jisi Liu2017-03-101-0/+1
| | | | | | | | | | | | Likely to be java language issue. Varargs are considered arrays, thus using generic with varargs will cause unchecked warning about generic array creation.
* | Merge pull request #2822 from anandolee/masterJie Luo2017-03-101-18/+73
|\ \ | | | | | | Detect generated code of WKT, addressbook and conformance protos
| * | Add auto detect for generated code of WKT protos, addressbook.proto and ↵Jie Luo2017-03-101-18/+73
| | | | | | | | | | | | conformance.proto
* | | Merge pull request #2832 from pherl/javaepJisi Liu2017-03-102-1/+4
|\ \ \ | | |/ | |/| Fix java code according to error prone.
| * | Fix java code according to error prone.Jisi Liu2017-03-102-1/+4
| | |
* | | Merge pull request #2818 from xfxyjwf/i1470Feng Xiao2017-03-102-3/+52
|\ \ \ | | | | | | | | Don't expose gson exceptions in JsonFormat.
| * | | Don't expose gson exceptions in JsonFormat.Feng Xiao2017-03-092-3/+52
| | | |
* | | | Merge pull request #2824 from xfxyjwf/i1415Feng Xiao2017-03-103-10/+45
|\ \ \ \ | | | | | | | | | | Use per-type table to lookup JSON name.
| * | | | Use per-type table to lookup JSON name.Feng Xiao2017-03-093-10/+45
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #2826 from xfxyjwf/i1374Feng Xiao2017-03-101-0/+1
|\ \ \ \ | | | | | | | | | | Add missing thread dependency in cmake.
| * | | | Add missing thread dependency in cmake.Feng Xiao2017-03-091-0/+1
| |/ / /
* | | | Merge pull request #2827 from xfxyjwf/i1251Feng Xiao2017-03-101-3/+3
|\ \ \ \ | | | | | | | | | | Update comments for setSizeLimit.
| * | | | Update comments for setSizeLimit.Feng Xiao2017-03-091-3/+3
| |/ / /
* | | / Repeated/Map field setter should accept a regular PHP array (#2817)Paul Yang2017-03-109-41/+355
| |_|/ |/| | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #2825 from pherl/javawarningJisi Liu2017-03-097-0/+15
|\ \ \ | | | | | | | | Cherry-pick changes from javalite branch to also fix Java warnings in the master branch
| * | | Fix GeneratedMessageV3 warnings.Jisi Liu2017-03-091-0/+4
| | | |
| * | | Fix lint warnings in the javalite branch.Jisi Liu2017-03-096-0/+11
| |/ /
* | | Merge pull request #2809 from xfxyjwf/i2464Feng Xiao2017-03-092-4/+11
|\ \ \ | |/ / |/| | Make JsonFormat locale independent.
| * | Make JsonFormat locale independent.Feng Xiao2017-03-082-4/+11
| | |
* | | Merge pull request #2819 from haberman/pythonexceptJoshua Haberman2017-03-091-1/+1
|\ \ \ | | | | | | | | update_failure_list.py: fixed Python "raise" statement.
| * | | update_failure_list.py: fixed Python "raise" statement.Josh Haberman2017-03-091-1/+1
| | | |
* | | | Merge pull request #2804 from acozzette/ruby-memcpyAdam Cozzette2017-03-093-1/+60
|\ \ \ \ | |_|_|/ |/| | | Ruby: wrap calls to memcpy so that gem is compatible with pre-2.14 glibc
| * | | Ruby: wrap calls to memcpy so that gem is compatible with pre-2.14 glibcAdam Cozzette2017-03-093-1/+60
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: https://github.com/grpc/grpc/blob/5098508d2d41a116113f7e333c516cd9ef34a943/src/core/lib/support/wrap_memcpy.c This fixes issue #2783.
* | | Merge pull request #2810 from xfxyjwf/i1994Feng Xiao2017-03-091-4/+22
|\ \ \ | | | | | | | | Avoid redundant type casts for oneof bytes fields.
| * | | Avoid redundant type casts for oneof bytes fields.Feng Xiao2017-03-081-4/+22
| | |/ | |/|
* | | Merge pull request #2775 from xfxyjwf/fixmajorFeng Xiao2017-03-092-1/+14
|\ \ \ | | | | | | | | Undef major/minor if they are defined as macro.
| * | | Undef major/minor if they are defined as macro.Feng Xiao2017-02-282-1/+14
| | | |
* | | | Merge pull request #2814 from pherl/javadeprecateJisi Liu2017-03-093-10/+28
|\ \ \ \ | |_|/ / |/| | | Add annotations for deprecated messages in Java
| * | | Add annotations for deprecated messages in JavaJisi Liu2017-03-093-10/+28
| | | |
* | | | Merge pull request #2602 from GreatFruitOmsk/issue-2428Feng Xiao2017-03-081-1/+4
|\ \ \ \ | | | | | | | | | | Method Builder#clone() has been changed to bypass Java 1.6 compiler issue.
| * | | | Update AbstractMessage.javagoorov2017-01-131-1/+1
| | | | | | | | | | | | | | | Apply review's comments.
| * | | | Update AbstractMessage.javagoorov2017-01-121-1/+4
| | | | | | | | | | | | | | | Method Builder#clone() has been changed to bypass Java 1.6 compiler issue.
* | | | | Fix Bad Link for Common LispJie Luo2017-03-081-1/+1
| | | | |
* | | | | Rename encode/decode to serializeToString/mergeFromString (#2795)Paul Yang2017-03-0814-62/+314
| |_|_|/ |/| | | | | | | | | | | | | | | This better shows the semantic of the API. For already setted fields, mergeFromString do replacement for singular fields and appending for repeated fields.
* | | | Merge pull request #2793 from keveman/masterFeng Xiao2017-03-071-1/+0
|\ \ \ \ | | | | | | | | | | Removed a stray return statement, causing compilation error.
| * | | | Removed a stray return statement, causing compilation error.Manjunath Kudlur2017-03-061-1/+0
| | | | |
* | | | | Merge pull request #2613 from aausch/fix_memory_leakJisi Liu2017-03-061-1/+8
|\ \ \ \ \ | |/ / / / |/| | | | optimization and quick workaround to memory leak
| * | | | cache generated classes, optimization and quick workaround to memory leakAlex Ausch2017-01-301-1/+8
| | | | |
* | | | | Detect if Descriptor.cs changes for csharpJie Luo2017-03-064-1/+145
|\ \ \ \ \ | | | | | | | | | | | | Merge pull request #2788 from anandolee/master
| * | | | | Detect if Descriptor.cs changes for csharpJie Luo2017-03-024-1/+145
| | | | | |
* | | | | | Merge pull request #2751 from keveman/masterFeng Xiao2017-03-061-9/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added a header only cc_library target for the protobuf library.
| * | | | | | Added comment explaining the protobuf_headers target.Manjunath Kudlur2017-03-021-0/+4
| | | | | | |
| * | | | | | Added a header only cc_library target for the protobuf library.Manjunath Kudlur2017-02-231-9/+17
| | | | | | |
* | | | | | | Merge pull request #2784 from acozzette/log-2-floor-intAdam Cozzette2017-03-031-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Return uint32 from Log2FloorNonZero64
| * | | | | | Return uint32 from Log2FloorNonZero64Adam Cozzette2017-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge pull request #2755 from xfxyjwf/rubycompFeng Xiao2017-03-0211-1/+2009
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add Ruby compatibilty test against 3.0.0.
| * | | | | | | Add Ruby compatibilty test against 3.0.0.Feng Xiao2017-02-2711-1/+2009
| | | | | | | |
* | | | | | | | Merge pull request #2785 from thomasvl/threading_raceThomas Van Lenten2017-03-024-9/+46
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Handing threading race resolving methods.
| * | | | | | | Handing threading race resolving methods.Thomas Van Lenten2017-03-024-9/+46
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 16:54:57 +0000