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

5150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Yang
3b7a5f4515 Fix several more memory leak 2017-12-06 10:38:18 -08:00
Bo Yang
7d3437152a Fix memory leak when creating map field via array. 2017-12-06 10:37:53 -08:00
Bo Yang
e0d3aa057b Fix memory leak when creating repeated field via array. 2017-12-06 10:37:26 -08:00
Paul Yang
de44982a74 Remove duplicate typedef. (#3975) 2017-12-06 10:36:52 -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
Paul Yang
188f18044f
All integer types should accept null in json. (#3869) 2017-11-13 09:31:28 -08: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
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
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
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
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
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
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