Commit Graph

5748 Commits

Author SHA1 Message Date
Feng Xiao
fc243c15fb
Merge pull request #2470 from xuwei-k/patch-1
update ScalaPB url
2018-06-22 21:35:56 -07:00
Feng Xiao
91707246eb
Merge pull request #4168 from jin/master
Use versions module from Skylib for version checking
2018-06-22 17:47:17 -07:00
Adam Cozzette
f42d5923f0
Merge pull request #4815 from vervaekejonathan/master
Fix parameters declaration
2018-06-22 10:01:12 -07:00
vervaekejonathan
496822d307
Fix parameters declaration 2018-06-22 14:32:43 +02:00
Feng Xiao
6a4fec616e
Merge pull request #4813 from htuch/fix-any-in-map
protostream_objectwriter: fix bug when Any is directly embedded in a …
2018-06-21 16:37:38 -07:00
Feng Xiao
f35669b8d3
Merge pull request #4812 from htuch/fix-any-case
protostream_objectsource: preserve print options across Any.
2018-06-21 16:37:22 -07:00
Sydney Acksman
1f77342b78 Add msbuild targets to C# tools for protoc compilers (#4648)
* Added props to C# tools

* Add targets file to makefile.am
2018-06-21 14:53:31 -07:00
Feng Xiao
bdf0d1d6f8
Merge pull request #4811 from htuch/invalid-name-json
json: include field name in InvalidName status messages.
2018-06-21 12:37:36 -07:00
Harvey Tuch
395ae4f7ad Added TODO for grouping options.
Signed-off-by: Harvey Tuch <htuch@google.com>
2018-06-21 15:31:18 -04:00
Harvey Tuch
2d31d0c706 protostream_objectwriter: fix bug when Any is directly embedded in a map.
This came up when trying to round-trip the JSON<->proto3 conversion for
Envoy's envoy.admin.v2alpha.ConfigDump
(b903c1dc98/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>
2018-06-21 15:24:50 -04:00
Harvey Tuch
0584084b7e protostream_objectsource: preserve print options across Any.
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>
2018-06-21 14:41:17 -04:00
Harvey Tuch
6eb78b1e84 Additional whitespace.
Signed-off-by: Harvey Tuch <htuch@google.com>
2018-06-21 14:09:53 -04:00
Harvey Tuch
44a2a2fcab json: include field name in InvalidName status messages.
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>
2018-06-21 13:57:31 -04:00
cclauss
e9063ccf19 print() is a function in Python 3 (#4754) 2018-06-20 15:18:20 -07:00
Adam Cozzette
85ba13c9bf
Merge pull request #1261 from gjasny/disable-tls-for-osx-10.6
Disable thread local storage for OSX < 10.7
2018-06-20 13:02:16 -07:00
Adam Cozzette
e3ea413ab0
Merge pull request #4780 from mwei0210/master
check provided size to check whether to export
2018-06-20 10:48:08 -07:00
Feng Xiao
761a6275d4
Merge pull request #4797 from sankate/master
Fix typo in the doc
2018-06-19 23:46:27 -07:00
Sankate Sharma
ef31e70ee9 Fix typo in the doc 2018-06-19 23:09:04 -07:00
igorpeshansky
944693c44c Add Google::Protobuf::Any.pack convenience class method. (#4719) 2018-06-19 13:26:41 -07:00
Feng Xiao
0c3db0269b
Merge pull request #4792 from google/issuetemplates
Update issue templates
2018-06-19 11:53:19 -07:00
Feng Xiao
778478b2a5 Add github issue templates 2018-06-19 11:52:03 -07:00
Feng Xiao
630757c3d9
Merge pull request #4306 from oniksan/upadate-thirdparty
Update third_party.md
2018-06-18 20:52:53 -07:00
ming
6074aaa988 not empty 2018-06-19 11:47:21 +08:00
Feng Xiao
77d4103685
Merge pull request #4626 from robhancocksed/master
Declare some generated C++ methods as static #4602
2018-06-18 20:45:49 -07:00
ming
9bfed46c41 check provided size 2018-06-19 07:20:31 +08:00
Feng Xiao
8af87de949
Merge pull request #2121 from mazurkin/issue-2108
issue-2108 [protoc/Java] Excessive copying on buildPartial()
2018-06-18 15:00:06 -07:00
medinandres
e264d6bc58 proto_writer.h: RenderBytes is an override. Marking it. (#4707)
* proto_writer.h: RenderBytes is an override. Marking it.
2018-06-18 13:54:31 -07:00
Feng Xiao
36c5780a3d
Merge pull request #4739 from asimshankar/tf-bytesize
Graceful failure in SerializeToArray().
2018-06-18 13:53:19 -07:00
Feng Xiao
b40cb4bc8b
Merge pull request #4760 from dslomov/fix-buildfile-references
Update build file locations.
2018-06-13 10:25:46 -07:00
Dmitry Lomov
8be6967ca8 Update build file locations.
Fixes https://github.com/bazelbuild/bazel/issues/5383.
2018-06-13 11:06:18 +02:00
Yilun Chong
ef9d868353
Merge pull request #4755 from xfxyjwf/fix_benchmarks_link
Fix incorrect link.
2018-06-12 13:39:59 -07:00
Feng Xiao
2efcec95b6
Merge pull request #4748 from cmclean/master
Make proto_api target visible
2018-06-12 13:22:48 -07:00
Feng Xiao
beb2d8dd40
Merge pull request #4758 from dslomov/patch-1
Migrate to supported version of http_archive
2018-06-12 10:17:06 -07:00
Dmitry Lomov
e62c1bd034
Fix typo 2018-06-12 14:09:17 +02:00
Dmitry Lomov
31232c9b1e
Migrate to supported version of http_archive
Fixes #4727.
2018-06-12 14:03:16 +02:00
Feng Xiao
7eef83d27a Fix incorrect link. 2018-06-11 22:59:03 -07:00
Feng Xiao
4fda0f783b
Merge pull request #2811 from Dunemaster/master
Java: Mark sun.misc dependency as optional
2018-06-11 15:36:05 -07:00
Feng Xiao
f81a3910c0
Merge pull request #3901 from wijagels/master
Fix unused parameter warnings in generated code with arenas enabled
2018-06-11 14:37:05 -07:00
cclauss
35c6927cc1 import inspect (#3507)
Inspect is used five times on line 65-74 without being imported.
2018-06-11 14:17:46 -07:00
Cory McLean
b7d3ec3aa9 Make proto_api target visible 2018-06-11 12:18:45 -04:00
Feng Xiao
a0e82dbe56
Merge pull request #4725 from ThomasColthurst/patch-2
Remove cycle in dependency graph
2018-06-09 23:25:56 -07:00
Asim Shankar
2020e3d5ee Graceful failure in SerializeToArray().
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.
2018-06-07 09:24:42 -07:00
Loo Rong Jie
0456e269ee Align Bazel on Windows with CMake's MSVC flags (#4720)
* Align Bazel on Windows with CMake's MSVC flags
2018-06-05 19:03:24 -07:00
Sergio Campamá
6933e2f499 Update code to work for Xcode 10b1 (#4729)
* Update code to work for Xcode 10b

* Update README and test scripts to mention that Xcode 7 is no longer supported
2018-06-05 15:14:19 -04:00
Thomas Colthurst
ee8d3aa308
Remove cycle in dependency graph 2018-06-04 16:38:58 -04:00
Yilun Chong
a4d16ed886
Merge pull request #4699 from BSBandme/add_proto2_to_proto3_plugin
Add proto2 to proto3 util
2018-06-04 12:03:58 -07:00
Yilun Chong
61dac6d592 Fix 2018-06-04 10:16:40 -07:00
Feng Xiao
a7252bf42d
Merge pull request #4698 from ThomasColthurst/proto_c_api
Introduce Proto C API; based on cl/198113115 by amauryfa
2018-06-03 14:54:53 -07:00
Feng Xiao
17ab85deab
Merge pull request #4714 from dcarp/reference_protobuf_d
Add reference to protobuf-d
2018-06-03 14:27:47 -07:00
Dragos Carp
ceaf0122f2 Add reference to protobuf-d
https://github.com/dcarp/protobuf-d is a conformance tested proto3
runtime library and code generator for D.
2018-06-02 11:19:25 +02:00