Yangqing Jia
cba18efe18
Allow one to omit building libprotoc and protoc binaries
2017-11-13 15:15:39 -08:00
Jisi Liu
d3537c24ff
Merge pull request #3834 from sviterok/patch-1
...
Fix a typo in WKT's test suite
2017-11-13 14:38:34 -08:00
Jisi Liu
0cd2ad11b8
Update protoc-artfacts
2017-11-13 12:29:06 -08:00
Jisi Liu
2720cdc568
Update README.md
2017-11-13 12:23:58 -08:00
Jisi Liu
4041600aa1
Merge branch '3.5.x' of github.com:google/protobuf into 3.5.x
2017-11-13 10:48:40 -08:00
Jisi Liu
4493595f8c
Update release date
2017-11-13 10:47:48 -08:00
Jisi Liu
2761122b81
Merge pull request #3868 from pherl/3.5.x
...
Support win32 long path for cross compiled build
2017-11-13 10:47:29 -08:00
Feng Xiao
b9f891e3dd
Merge pull request #3875 from hchasestevens/add-hypothesis-protobuf-doc
...
Add hypothesis-protobuf library to the 3rd party doc.
2017-11-13 10:39:06 -08:00
Paul Yang
188f18044f
All integer types should accept null in json. ( #3869 )
2017-11-13 09:31:28 -08:00
H. Chase Stevens
3c331432b5
Add hypothesis-protobuf library to the 3rd party doc.
2017-11-13 11:42:41 -05:00
Jon Skeet
8cf53f8dfc
MMinor fix-ups to C# tests from changes in earlier commits
2017-11-12 15:29:15 +00:00
Jon Skeet
b5cdf0eac6
Regenerated test code for C#
2017-11-12 15:29:15 +00:00
Jon Skeet
aa77eab622
Move C#-only test protos to csharp/protos
...
unittest_proto3 had been changed in a very backward-incompatible
way which was never going to work with C# as it imports proto2 messages.
This is now a copy of the old file, but with a package name change for
compatibility with the remaining files in src/google/protobuf.
The other moves are for files that are only used by C#.
2017-11-12 15:29:15 +00:00
Jon Skeet
9a9a66e715
Run C# codegen when testing it
...
This will cause failures if shared protos change in an incompatible
way.
2017-11-12 15:29:15 +00:00
Jisi Liu
9c197b7ecb
Support win32 long path for cross compiled build
2017-11-10 10:28:14 -08:00
Jisi Liu
fe2b4af3d1
Merge pull request #3867 from jtattermusch/update_changelog
...
Update changelog
2017-11-10 09:39:28 -08:00
Jan Tattermusch
07df2307b2
update changelog
2017-11-10 18:37:33 +01:00
Jisi Liu
966a9ed96a
Merge pull request #3861 from jtattermusch/backport_3858
...
Backport #3858 to 3.5.x branch
2017-11-10 09:30:40 -08:00
Jan Tattermusch
5f96191459
ParseFrom<T> for array slice is missing
2017-11-10 09:01:32 +01:00
Jan Tattermusch
4a5e1bd043
check already performed by MergeFrom
2017-11-10 09:01:07 +01:00
Jan Tattermusch
435f61102b
allow message parsing from an array slice
2017-11-10 09:00:52 +01:00
Jan Tattermusch
ce0a53273a
Merge pull request #3858 from jtattermusch/parsing_from_slice
...
C#: Allow message parsing from an array slice
2017-11-10 08:57:40 +01:00
Jisi Liu
5eb717c300
Fix arm64 name
2017-11-09 17:22:03 -08:00
Jisi Liu
b879abc811
Supports Arm64 (aarch64) protoc artifacts
2017-11-09 17:16:42 -08:00
Jan Tattermusch
30b6e54327
ParseFrom<T> for array slice is missing
2017-11-09 18:33:15 +01:00
Jan Tattermusch
07542e78da
check already performed by MergeFrom
2017-11-09 18:27:45 +01:00
Jan Tattermusch
0c874a6a19
allow message parsing from an array slice
2017-11-09 14:23:14 +01:00
Jisi Liu
0971efb16e
Merge pull request #3854 from pherl/3.5.x
...
Fix Atomic32/AtomicWord on some platforms.
2017-11-08 16:11:47 -08:00
Paul Yang
662e8b20bc
Provide util funtions to figure out correct php class names. ( #3850 )
2017-11-08 15:39:47 -08:00
Jisi Liu
181e284b55
Fix Atomic32/AtomicWord on some platforms.
...
- Removed the redefination in the atomicword_compat.h. Now Atomic32 will
alwyas be intptr_t in 32bit platforms, the bridge is no longer needed.
- Change NaCl 64bit to use intptr_t instead of int32 for Atomic32,
otherwise AtmoicWord APIs will miss the definations.
After this change, the AtmoicWord will always be either Atomic32 or
Atmoic64 depending on the platforms.
2017-11-08 15:27:48 -08:00
Jisi Liu
1144768dd6
Merge pull request #3835 from pherl/3.5.x
...
Update version number to 3.5.0
2017-11-08 13:56:58 -08:00
Jisi Liu
8a3c5cc992
Fix java code example
2017-11-08 13:55:55 -08:00
Jisi Liu
ce2d5282b7
Changelog for 3.5.0
2017-11-08 13:50:25 -08:00
Jisi Liu
c258fb303a
Merge pull request #3822 from mehrdada/update-benchmark-submodule
...
Update google/benchmark submodule to v1.2
2017-11-06 10:25:42 -08:00
Paul Yang
2df472690e
Fix php well known type conformance tests ( #3828 ) ( #3840 )
...
* Fix php well known type conformance tests
* Properly generate code for test.proto
* Provide GPBMetadata files in c extensions for generated files to import.
* Remove unnecessary test
* Clean up code
* Add declaration for initOnce.
* Refactoring
2017-11-04 09:33:56 -07:00
Paul Yang
bcda919cee
Fix php well known type conformance tests ( #3828 )
...
* Fix php well known type conformance tests
* Properly generate code for test.proto
* Provide GPBMetadata files in c extensions for generated files to import.
* Remove unnecessary test
* Clean up code
* Add declaration for initOnce.
* Refactoring
2017-11-03 12:30:09 -07:00
Thomas Van Lenten
239dba535c
Merge pull request #3839 from thomasvl/message_equality
...
When comparing message, require them to have the same descriptor.
2017-11-03 12:54:28 -04:00
Thomas Van Lenten
1f57e540ac
When comparing message, require them to have the same descriptor.
...
This will cover someone subclassing the message, and also handles
something crazy like someone comparing to a raw NSObject.
2017-11-03 12:49:28 -04:00
Jisi Liu
1908012710
Update generated descritpors.
2017-11-02 14:29:02 -07:00
Jisi Liu
97dd175a91
Update version number to 3.5.0
2017-11-02 14:16:22 -07:00
Roman Nekhoroshev
da3bfa693a
Fix a typo in WKT's test suite
...
Hi!
Sorry for bothering with such a minor thing, but I just noticed and fixed one annoying typo in WKT's test suite:
`"accpets" -> "accepts"`
Thanks!
2017-11-02 13:47:11 -07:00
Jon Skeet
cbe250591f
Fix merging with message-valued oneof
...
If messages A and B have the same oneof case, which is a message
type, and we merge B into A, those sub-messages should be merged.
Fixes #3200 .
Note that I haven't regenerated all the code, as some of the protos
have been changed, breaking generation.
2017-10-31 17:11:40 -07:00
Mehrdad Afshari
bb35f04fe6
Update google/benchmark submodule to v1.2
...
Fixed some build issues on ppc64le architecture
2017-10-30 12:30:00 -07:00
Feng Xiao
6dd8224393
Merge pull request #3817 from xuwei-k/joda-url
...
update joda-time javadoc url
2017-10-30 12:12:20 -07:00
xuwei-k
05b56d01c1
update joda-time javadoc url
2017-10-30 17:48:54 +09:00
Jon Skeet
e8c9ae1209
Add parser settings WithXyz methods
2017-10-28 07:47:43 +01:00
Jon Skeet
a985451253
Add JsonParser setting to ignore unknown field values
...
Note that the default behavior is still to throw an exception; you
need to opt into ignoring unknown fields.
Fixes #2838 .
2017-10-28 07:47:43 +01:00
Jisi Liu
4526d8baa0
Merge pull request #3722 from timou/cmake-windows-clean
...
Suppress VS2017 compiler/linker warnings
2017-10-27 12:37:30 -07:00
Paul Yang
23adfeb003
Reserve unknown in Ruby ( #3763 )
...
* Reserve unknown in ruby
* Revert ruby tests. Wait for cpp impl for conformance test
* Add conformance test for preserving unknown
* Add unknown field conformance test to csharp failure list.
* Fix comments
* Fix comment
* Fix comments
* Fix typo
* Use stringsink_string directly
* Mark hd unused
* Remove unused encodeunknown_handlerfunc
2017-10-26 14:41:43 -07:00
Jisi Liu
a08b03d4c0
Add missing files
2017-10-26 13:48:53 -07:00
