AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
5,146 Commits 35 Branches 138 Tags 124 MiB
9d7f313372
Commit Graph

5146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave MacLachlan
9d7f313372 Reduce size of GPBDictionary by getting rid of class creation methods 2017-11-14 15:37:28 -08:00
Jon Skeet
91ff83c024 Remove non-C# options from C#-only test protos 2017-11-14 07:31:59 +00: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
2720cdc568
Update README.md 2017-11-13 12:23:58 -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
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
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
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
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
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
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
Jisi Liu
9aaa8e1e55 Merge pull request #3804 from pherl/merge 
Merge 3.4.x into master before cutting 3.5.x
 2017-10-26 12:20:56 -07:00
Adam Cozzette
2fc7aea360 Merge pull request #3791 from signalwerk/patch-1 
To be clear that we set a new variable
 2017-10-26 10:10:20 -07:00
Jisi Liu
cdc0d9536a Merge remote-tracking branch 'origin/3.4.x' into master 2017-10-25 14:43:07 -07:00
Thomas Van Lenten
ee8a0911cb Merge pull request #3787 from sergiocampama/coverage 
Improves coverage of GPBCodedInputStream
 2017-10-24 10:49:50 -04:00
Sergio Campama
b1f954e639 Improves coverage of GPBCodedInputStream 2017-10-24 10:44:41 -04:00
Stefan Huber
44daa59e53 To be clear that we set a new variable 2017-10-24 14:01:22 +02:00
Tim Ebringer
a23669c2f6 Sort MSVC warning suppressions 
Add brief documentation describing each warning suppression.
 2017-10-21 09:40:32 -04:00
Jisi Liu
cefa9d73e3 Merge pull request #3758 from spinorx/3.4.x 
[v3.4.x branch] Fix iOS cc_library build for protobuf.
 2017-10-20 11:56:31 -07:00
Jisi Liu
b189389e2f Merge pull request #3757 from spinorx/master 
Fix iOS cc_library build for protobuf.
 2017-10-20 11:56:13 -07:00
Jisi Liu
09e0dbcf8f Merge pull request #3743 from Schtolc/master 
CodedInputStream::SetTotalBytesLimit description fix
 2017-10-19 10:56:03 -07:00
Jisi Liu
2a14214045 Merge pull request #3754 from toanju/gcc-fallthrough 
fix implicit fallthrough in gcc 7
 2017-10-19 10:54:50 -07:00
Jisi Liu
07b9238a1c Merge pull request #3770 from pherl/3.5-integrate 
Integrate google internal changes for the up coming 3.5 release.
 2017-10-19 10:48:54 -07:00
Jisi Liu
2ee294d80b Fix Java 1.6 compile 2017-10-18 16:28:12 -07:00
Jisi Liu
9c407a16e4 Merge pull request #3751 from uykusuz/master 
fixes issue #3750
 2017-10-18 15:39:12 -07:00
Jisi Liu
ca6187d5e7 Merge pull request #3578 from pherl/filedeprecation 
Add @Deprecated annotation support for proto file.
 2017-10-18 15:33:31 -07:00
Jisi Liu
dedf9041c0 Merge pull request #3764 from zearen/patch-1 
Add the proto-lens Haskell library to the 3rd party doc.
 2017-10-18 15:28:37 -07:00
Jisi Liu
37f984f9df Merge pull request #3698 from hesmar/hesmar/fixProtocIncludeDirs 
protobuf_generate: create include path only for proto files
 2017-10-18 15:27:42 -07:00
Jisi Liu
3d6cc0e74b Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3 
Clang warning cleanup for unused parameter.
 2017-10-18 15:25:21 -07:00
Jisi Liu
2e2614e4c4 Merge pull request #3706 from johanbrandhorst/patch-1 
Add GopherJS protobuf and gRPC links
 2017-10-18 15:19:53 -07:00
Jisi Liu
188755c065 Fix JS conformance tests 2017-10-18 15:09:21 -07:00
Jisi Liu
1c682e0b0b Fix bazel build 2017-10-18 14:31:23 -07:00
Jisi Liu
ecf2957106 Update descriptor protos 2017-10-18 14:21:22 -07:00