aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Fixed protobuf_generate output definition for files relative to the ↵Steffen Wittmeier2018-06-251-1/+3
| |/ / / | | | | | | | | | | | | protobuf_generate command
* | | | Improved install command. (#4106)Vladimir Kovpak2018-06-251-1/+1
| | | | | | | | | | | | Added `-y` flag to `sudo apt-get` command.
* | | | Merge pull request #4608 from khuzemap/masterFeng Xiao2018-06-2536-448/+473
|\ \ \ \ | | | | | | | | | | Add "override" keyword for overridden virtual functions
| * | | | Add "override" for overridden virtual functionsKhuzema Pithewan2018-06-1936-449/+474
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "override" for overridden virtual functions. Please refer following issue for discussion on this. https://github.com/google/protobuf/issues/67
* | | | | Merge pull request #4172 from OskarKinomoto/masterAdam Cozzette2018-06-251-0/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | Add guards against bswap_XX redefnitions
| * | | | Add guards against bswap_XX redefnitionsOskar Świtalski2018-01-151-0/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Oskar Świtalski <oskar.switalski@indoorway.com>
* | | | | global __version__ In setup.py (#4753)cclauss2018-06-251-0/+1
| |_|/ / |/| | | | | | | This change helps both humans and linters to understand the unusual method of instantiating this global variable.
* | | | Merge pull request #2470 from xuwei-k/patch-1Feng Xiao2018-06-221-1/+1
|\ \ \ \ | | | | | | | | | | update ScalaPB url
| * | | | update ScalaPB urlxuwei-k2018-01-241-1/+1
| | | | |
* | | | | Merge pull request #4168 from jin/masterFeng Xiao2018-06-222-4/+10
|\ \ \ \ \ | | | | | | | | | | | | Use versions module from Skylib for version checking
| * | | | | Use versions module from Skylib for version checkingJingwen Chen2018-01-122-4/+10
| | | | | |
* | | | | | Merge pull request #4815 from vervaekejonathan/masterAdam Cozzette2018-06-221-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix parameters declaration
| * | | | | | Fix parameters declarationvervaekejonathan2018-06-221-2/+2
|/ / / / / /
* | | | | | Merge pull request #4813 from htuch/fix-any-in-mapFeng Xiao2018-06-214-2/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | protostream_objectwriter: fix bug when Any is directly embedded in a …
| * | | | | | protostream_objectwriter: fix bug when Any is directly embedded in a map.Harvey Tuch2018-06-214-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This came up when trying to round-trip the JSON<->proto3 conversion for Envoy's envoy.admin.v2alpha.ConfigDump (https://github.com/envoyproxy/envoy/blob/b903c1dc984593f8e95e0569c1503dc5d85fbe34/api/envoy/admin/v2alpha/config_dump.proto#L29). Validated fix on the Envoy code base and via the provided unit test. Signed-off-by: Harvey Tuch <htuch@google.com>
* | | | | | | Merge pull request #4812 from htuch/fix-any-caseFeng Xiao2018-06-213-0/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | protostream_objectsource: preserve print options across Any.
| * | | | | | | Added TODO for grouping options.Harvey Tuch2018-06-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Harvey Tuch <htuch@google.com>
| * | | | | | | protostream_objectsource: preserve print options across Any.Harvey Tuch2018-06-213-0/+85
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4771. Based on the solution included in the issues from @wangjinhua. Validated this works with Envoy's /config_dump JSON rendering. Signed-off-by: Harvey Tuch <htuch@google.com>
* | | | | | | Add msbuild targets to C# tools for protoc compilers (#4648)Sydney Acksman2018-06-213-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added props to C# tools * Add targets file to makefile.am
* | | | | | | Merge pull request #4811 from htuch/invalid-name-jsonFeng Xiao2018-06-211-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | json: include field name in InvalidName status messages.
| * | | | | | | Additional whitespace.Harvey Tuch2018-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Harvey Tuch <htuch@google.com>
| * | | | | | | json: include field name in InvalidName status messages.Harvey Tuch2018-06-211-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is invaluable for chasing down the culprit in failed JSON -> proto conversions. We often see in Envoy that a failed JSON (or indirectly via YAML) configuration won't load but it's unclear why. Signed-off-by: Harvey Tuch <htuch@google.com>
* | | | | | | print() is a function in Python 3 (#4754)csharp3.6.0cclauss2018-06-203-27/+31
| | | | | | |
* | | | | | | Merge pull request #1261 from gjasny/disable-tls-for-osx-10.6Adam Cozzette2018-06-201-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Disable thread local storage for OSX < 10.7
| * | | | | | | Disable thread local storage for OSX < 10.7Gregor Jasny2016-02-191-0/+6
| | | | | | | |
* | | | | | | | Merge pull request #4780 from mwei0210/masterAdam Cozzette2018-06-201-1/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | check provided size to check whether to export
| * | | | | | | not emptyming2018-06-191-1/+1
| | | | | | | |
| * | | | | | | check provided sizeming2018-06-191-1/+2
| | | | | | | |
* | | | | | | | Merge pull request #4797 from sankate/masterFeng Xiao2018-06-191-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix typo in the doc
| * | | | | | | | Fix typo in the docSankate Sharma2018-06-191-1/+1
|/ / / / / / / /
* | | | | | | | Add Google::Protobuf::Any.pack convenience class method. (#4719)igorpeshansky2018-06-192-1/+13
| | | | | | | |
* | | | | | | | Merge pull request #4792 from google/issuetemplatesFeng Xiao2018-06-193-0/+53
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update issue templates
| * | | | | | | | Add github issue templatesissuetemplatesFeng Xiao2018-06-193-0/+53
|/ / / / / / / /
* | | | | | | | Merge pull request #4306 from oniksan/upadate-thirdpartyFeng Xiao2018-06-181-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update third_party.md
| * | | | | | | | Update third_party.mdOleg Malyavkin2018-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add GDScript Protobuf implementation
* | | | | | | | | Merge pull request #4626 from robhancocksed/masterFeng Xiao2018-06-1813-39/+39
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Declare some generated C++ methods as static #4602
| * | | | | | | | Declare some generated C++ methods as static #4602Robert Hancock2018-05-1413-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids compile warnings when compiling generated code with the -Wmissing-declarations option.
* | | | | | | | | Merge pull request #2121 from mazurkin/issue-2108Feng Xiao2018-06-185-22/+44
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | issue-2108 [protoc/Java] Excessive copying on buildPartial()
| * | | | | | | | | [issue-2108] [protoc/java] Excessive copying on buildPartial()Nickolay Mazurkin2016-09-185-22/+44
| | | | | | | | | |
* | | | | | | | | | proto_writer.h: RenderBytes is an override. Marking it. (#4707)medinandres2018-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * proto_writer.h: RenderBytes is an override. Marking it.
* | | | | | | | | | Merge pull request #4739 from asimshankar/tf-bytesizeFeng Xiao2018-06-181-1/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Graceful failure in SerializeToArray().
| * | | | | | | | | | Graceful failure in SerializeToArray().Asim Shankar2018-06-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/tensorflow/tensorflow/issues/19657 for motivation. But long story short, without this change: m.SerializeToArray(buffer, m.ByteSizeLong()); would result in a CHECK failure if m.ByteSizeLong() returned a value >2GB.
* | | | | | | | | | | Merge pull request #4760 from dslomov/fix-buildfile-referencesFeng Xiao2018-06-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update build file locations.
| * | | | | | | | | | | Update build file locations.Dmitry Lomov2018-06-131-2/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/bazelbuild/bazel/issues/5383.
* | | | | | | | | | | Merge pull request #4755 from xfxyjwf/fix_benchmarks_linkYilun Chong2018-06-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect link.
| * | | | | | | | | | | Fix incorrect link.Feng Xiao2018-06-111-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4748 from cmclean/masterFeng Xiao2018-06-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Make proto_api target visible
| * | | | | | | | | | | | Make proto_api target visibleCory McLean2018-06-111-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4758 from dslomov/patch-1Feng Xiao2018-06-121-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | Migrate to supported version of http_archive
| * | | | | | | | | | | | Fix typoDmitry Lomov2018-06-121-1/+1
| | | | | | | | | | | | |