Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ruby: fixed Message#to_h for map fields. | Josh Haberman | 2017-03-14 | 4 | -2/+55 |
| | |||||
* | Merge pull request #2843 from haberman/check | Joshua Haberman | 2017-03-14 | 1 | -3/+4 |
|\ | | | | | Replace CHECK() with GOOGLE_CHECK(). | ||||
| * | Replace CHECK() with GOOGLE_CHECK(). | Josh Haberman | 2017-03-13 | 1 | -3/+4 |
|/ | | | | Fixes: https://github.com/google/protobuf/issues/1175 | ||||
* | Merge pull request #2836 from xfxyjwf/i894 | Feng Xiao | 2017-03-13 | 2 | -123/+117 |
|\ | | | | | Double-quote file paths in extract_includes.bat.in | ||||
| * | Double-quote file paths in extract_includes.bat.in | Feng Xiao | 2017-03-10 | 2 | -123/+117 |
| | | | | | | | | | | This allows the file path to contain spaces which is very common on windows. | ||||
* | | Merge pull request #2835 from pherl/javaep | Jisi Liu | 2017-03-13 | 1 | -0/+1 |
|\ \ | | | | | | | Suppress the last unchecked warning. | ||||
| * | | Suppress the last unchecked warning. | Jisi Liu | 2017-03-10 | 1 | -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/master | Jie Luo | 2017-03-10 | 1 | -18/+73 |
|\ \ \ | | | | | | | | | Detect generated code of WKT, addressbook and conformance protos | ||||
| * | | | Add auto detect for generated code of WKT protos, addressbook.proto and ↵ | Jie Luo | 2017-03-10 | 1 | -18/+73 |
| | | | | | | | | | | | | | | | | conformance.proto | ||||
* | | | | Merge pull request #2832 from pherl/javaep | Jisi Liu | 2017-03-10 | 2 | -1/+4 |
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | Fix java code according to error prone. | ||||
| * | | Fix java code according to error prone. | Jisi Liu | 2017-03-10 | 2 | -1/+4 |
| | | | |||||
* | | | Merge pull request #2818 from xfxyjwf/i1470 | Feng Xiao | 2017-03-10 | 2 | -3/+52 |
|\ \ \ | | | | | | | | | Don't expose gson exceptions in JsonFormat. | ||||
| * | | | Don't expose gson exceptions in JsonFormat. | Feng Xiao | 2017-03-09 | 2 | -3/+52 |
| | | | | |||||
* | | | | Merge pull request #2824 from xfxyjwf/i1415 | Feng Xiao | 2017-03-10 | 3 | -10/+45 |
|\ \ \ \ | | | | | | | | | | | Use per-type table to lookup JSON name. | ||||
| * | | | | Use per-type table to lookup JSON name. | Feng Xiao | 2017-03-09 | 3 | -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/i1374 | Feng Xiao | 2017-03-10 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Add missing thread dependency in cmake. | ||||
| * | | | | Add missing thread dependency in cmake. | Feng Xiao | 2017-03-09 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge pull request #2827 from xfxyjwf/i1251 | Feng Xiao | 2017-03-10 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Update comments for setSizeLimit. | ||||
| * | | | | Update comments for setSizeLimit. | Feng Xiao | 2017-03-09 | 1 | -3/+3 |
| |/ / / | |||||
* | | / | Repeated/Map field setter should accept a regular PHP array (#2817) | Paul Yang | 2017-03-10 | 9 | -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/javawarning | Jisi Liu | 2017-03-09 | 7 | -0/+15 |
|\ \ \ | | | | | | | | | Cherry-pick changes from javalite branch to also fix Java warnings in the master branch | ||||
| * | | | Fix GeneratedMessageV3 warnings. | Jisi Liu | 2017-03-09 | 1 | -0/+4 |
| | | | | |||||
| * | | | Fix lint warnings in the javalite branch. | Jisi Liu | 2017-03-09 | 6 | -0/+11 |
| |/ / | |||||
* | | | Merge pull request #2809 from xfxyjwf/i2464 | Feng Xiao | 2017-03-09 | 2 | -4/+11 |
|\ \ \ | |/ / |/| | | Make JsonFormat locale independent. | ||||
| * | | Make JsonFormat locale independent. | Feng Xiao | 2017-03-08 | 2 | -4/+11 |
| | | | |||||
* | | | Merge pull request #2819 from haberman/pythonexcept | Joshua Haberman | 2017-03-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | update_failure_list.py: fixed Python "raise" statement. | ||||
| * | | | update_failure_list.py: fixed Python "raise" statement. | Josh Haberman | 2017-03-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2804 from acozzette/ruby-memcpy | Adam Cozzette | 2017-03-09 | 3 | -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 glibc | Adam Cozzette | 2017-03-09 | 3 | -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/i1994 | Feng Xiao | 2017-03-09 | 1 | -4/+22 |
|\ \ \ | | | | | | | | | Avoid redundant type casts for oneof bytes fields. | ||||
| * | | | Avoid redundant type casts for oneof bytes fields. | Feng Xiao | 2017-03-08 | 1 | -4/+22 |
| | |/ | |/| | |||||
* | | | Merge pull request #2775 from xfxyjwf/fixmajor | Feng Xiao | 2017-03-09 | 2 | -1/+14 |
|\ \ \ | | | | | | | | | Undef major/minor if they are defined as macro. | ||||
| * | | | Undef major/minor if they are defined as macro. | Feng Xiao | 2017-02-28 | 2 | -1/+14 |
| | | | | |||||
* | | | | Merge pull request #2814 from pherl/javadeprecate | Jisi Liu | 2017-03-09 | 3 | -10/+28 |
|\ \ \ \ | |_|/ / |/| | | | Add annotations for deprecated messages in Java | ||||
| * | | | Add annotations for deprecated messages in Java | Jisi Liu | 2017-03-09 | 3 | -10/+28 |
| | | | | |||||
* | | | | Merge pull request #2602 from GreatFruitOmsk/issue-2428 | Feng Xiao | 2017-03-08 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Method Builder#clone() has been changed to bypass Java 1.6 compiler issue. | ||||
| * | | | | Update AbstractMessage.java | goorov | 2017-01-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Apply review's comments. | ||||
| * | | | | Update AbstractMessage.java | goorov | 2017-01-12 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | Method Builder#clone() has been changed to bypass Java 1.6 compiler issue. | ||||
* | | | | | Fix Bad Link for Common Lisp | Jie Luo | 2017-03-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Rename encode/decode to serializeToString/mergeFromString (#2795) | Paul Yang | 2017-03-08 | 14 | -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/master | Feng Xiao | 2017-03-07 | 1 | -1/+0 |
|\ \ \ \ | | | | | | | | | | | Removed a stray return statement, causing compilation error. | ||||
| * | | | | Removed a stray return statement, causing compilation error. | Manjunath Kudlur | 2017-03-06 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge pull request #2613 from aausch/fix_memory_leak | Jisi Liu | 2017-03-06 | 1 | -1/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | optimization and quick workaround to memory leak | ||||
| * | | | | cache generated classes, optimization and quick workaround to memory leak | Alex Ausch | 2017-01-30 | 1 | -1/+8 |
| | | | | | |||||
* | | | | | Detect if Descriptor.cs changes for csharp | Jie Luo | 2017-03-06 | 4 | -1/+145 |
|\ \ \ \ \ | | | | | | | | | | | | | Merge pull request #2788 from anandolee/master | ||||
| * | | | | | Detect if Descriptor.cs changes for csharp | Jie Luo | 2017-03-02 | 4 | -1/+145 |
| | | | | | | |||||
* | | | | | | Merge pull request #2751 from keveman/master | Feng Xiao | 2017-03-06 | 1 | -9/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added a header only cc_library target for the protobuf library. | ||||
| * | | | | | | Added comment explaining the protobuf_headers target. | Manjunath Kudlur | 2017-03-02 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Added a header only cc_library target for the protobuf library. | Manjunath Kudlur | 2017-02-23 | 1 | -9/+17 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #2784 from acozzette/log-2-floor-int | Adam Cozzette | 2017-03-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Return uint32 from Log2FloorNonZero64 |