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

4595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Ching
3b1a87518c Remove inclusion of ext/json/php_json.h. (#3241) 
That implementation of json is not being used - this extension is using
a json encoder/decoder provided by 'upb'.
 2017-06-20 15:08:23 -07:00
Paul Yang
c344fe8caa Oneof field should be serialized even it's equal to default. (#3153) 2017-06-20 15:06:40 -07:00
Paul Yang
dba8928ff5 Add ARRAY for reserved name (#3150) 2017-06-20 15:06:22 -07:00
Feng Xiao
bf04c83267 Merge pull request #3085 from scpeters/issue_3059 
Use bool deterministic to suppress warning
 2017-05-19 11:22:45 -07:00
Feng Xiao
49a56da93f Update jenkins Java deps. 2017-05-12 16:10:30 -07:00
Feng Xiao
129a6e2aca Revert guava depedency to version 19. 2017-05-12 15:29:08 -07:00
Steven Peters
969e0bece2 regenerate plugin and profile message code 2017-05-11 16:35:32 -07:00
Steven Peters
26f00119f2 Use bool deterministic to suppress warning 
Fixes #3059 by re-applying 08b1c718 from #3087.
 2017-05-11 15:24:58 -07:00
Paul Yang
474cca52a3 Add LICENSE in package.xml (#3083) 2017-05-11 14:52:50 -07:00
Feng Xiao
13f532e472 Merge pull request #3074 from xfxyjwf/3.3.x 
Update version number to 3.3.1
 2017-05-11 14:32:19 -07:00
Paul Yang
de6ae7d4eb Fix upb load descriptor when no messages defined in prorto. (#3080) 2017-05-11 13:56:05 -07:00
Paul Yang
22319315df Fix c extension for php7.1. (#3077) 2017-05-10 15:59:59 -07:00
Feng Xiao
757cc9f9da Update C++ generated code. 2017-05-08 16:58:13 -07:00
Feng Xiao
58538ea919 Update version number to 3.3.1 2017-05-08 16:02:08 -07:00
Feng Xiao
c2154e124d Merge pull request #3073 from xfxyjwf/3.3.x 
Cherry-pick a bug fix: workaround gcc < 4.5.0 bug
 2017-05-08 13:38:48 -07:00
Feng Xiao
d22493b6f6 Merge pull request #3064 from randomguy3/offset-type 
Fix offset type macro to match the tables it is used in
 2017-05-08 11:56:18 -07:00
Mario J. Rugiero
9b82fce7f1 Workaround gcc < 4.5.0 bug 
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=189

Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com>
 2017-05-08 11:32:23 -07:00
randomguy3
e062f70c6d Fix compilation 
<: is a digraph, so a space is necessary for compilation on certain compilers.
 2017-05-06 09:08:44 +01:00
Alex Merry
e82d81a884 Fix offset type to match the tables it is used in 2017-05-05 22:04:28 +01:00
Feng Xiao
3c369dc07c Merge pull request #3057 from xfxyjwf/3.3.x 
Fix several C++ build issues.
 2017-05-05 10:45:23 -07:00
Adam Cozzette
99cf2efa8f Merge pull request #3056 from acozzette/cherry-pick-pr-2873 
Cherry-pick the fix from pull request #2873
 2017-05-05 08:58:11 -07:00
Feng Xiao
7378ec2bc8 Add missing LIBRPOTOC_EXPORT. 2017-05-04 15:27:30 -07:00
Feng Xiao
3a5a0724f3 Skip C# test in C++ only distribution. 2017-05-04 15:24:55 -07:00
Feng Xiao
8859c07a35 Add missing files to build files. 2017-05-04 15:11:11 -07:00
Paul Jolly
22c8772e21 Fix #1562 by using goog.crypt.byteArrayToString instead of String.fromCharCode.apply 2017-05-04 11:33:01 -07:00
Feng Xiao
dd0a23325d Merge pull request #3055 from chrisn-arm/3.3.x 
Fix compilation on alpine 3.5
 2017-05-04 11:08:53 -07:00
Chris Nix
c3093d3ee5 Fix issue 3046: compilation on alpine 3.5 2017-05-04 09:50:37 +01:00
Paul Yang
a6189acd18 Add prefix to enum value with reserved name. (#3020) 2017-04-26 16:32:21 -07:00
Paul Yang
3c0855e94a Add a test case for nested enum, which was missed previously. (#3010) 2017-04-25 10:47:09 -07:00
Paul Yang
fba2acd72e Add nested enum descriptor in php rumtime. (#3009) 2017-04-24 12:40:37 -07:00
Paul Yang
e64b618b21 Update php version number to 3.3.0 (#3001) 2017-04-24 09:24:43 -07:00
Paul Yang
6fff091c49 Throw exception when parsing invalid data. (#3000) 2017-04-21 15:00:00 -07:00
Feng Xiao
f418b9e3eb Merge pull request #2996 from xfxyjwf/3.3.x 
Fix python3 issue.
 2017-04-20 17:32:48 -07:00
Paul Yang
4523c9c233 Allow proto files to import descriptor.proto (#2995) 
descriptor.proto uses proto2 syntax, which is not ready for external
usage. However, some proto3 files import descriptor.proto and cannot be
used. In this PR, all references (We cheated by only removing
extensions, which is enough for now. User should avoid using messages
defined in descriptor.proto as field type.) to content in
descriptor.proto are removed from generated files. Those that import
descriptor.proto can be used like other proto files.
 2017-04-20 16:55:56 -07:00
Feng Xiao
478119fe77 Fix python3 issue. 2017-04-20 16:30:26 -07:00
Paul Yang
4c57e8475f Prepend "PB" to generated classes whose name are reserved words. (#2990) 2017-04-20 01:19:03 -07:00
Paul Yang
b97cd573e4 Add test for nested enum for php (#2989) 2017-04-19 21:20:55 -07:00
Paul Yang
7be088202b Enum defined without package have incorrect class name. (#2988) 
Fix the bug by sharing the code for generating class name for both
message and enum.
 2017-04-19 20:03:34 -07:00
Paul Yang
190b5270c8 Make PHP c extension work with PHP7 (#2951) 2017-04-19 16:23:51 -07:00
Feng Xiao
43234828da Merge pull request #2967 from xfxyjwf/3.3.x 
Fix map serialization
 2017-04-11 16:52:06 -07:00
Feng Xiao
5777259273 Cherry-pick cl/152450543 2017-04-11 16:15:46 -07:00
Feng Xiao
cad0258d17 Cherry-pick cl/151775298 2017-04-11 16:14:00 -07:00
Feng Xiao
fc3ea97870 Merge pull request #2955 from xfxyjwf/3.3.x 
Add include for INT_MAX
 2017-04-11 16:13:32 -07:00
Jie Luo
899460c9cb cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962) 
* Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject()

* Cherrypick the fix descriptor_pool.FindFileContainingSymbol by extensions.
 2017-04-10 16:37:57 -07:00
Feng Xiao
bfeeb98517 Add include for INT_MAX 2017-04-08 00:39:03 +00:00
Feng Xiao
e91caa1f19 Merge pull request #2949 from xfxyjwf/3.3.x 
Cleanup reflection objects for map entry.
 2017-04-07 11:30:40 -07:00
Feng Xiao
ee9c7f17e9 Cleanup reflection objects for map entry. 2017-04-06 16:47:18 -07:00
Feng Xiao
18c13c93de Merge pull request #2942 from xfxyjwf/3.3.x 
Update version number and changelog for 3.3.0
 2017-04-06 11:46:51 -07:00
Feng Xiao
21b0b3ca36 Update generated code. 2017-04-05 17:45:21 -07:00
Feng Xiao
80f0c0ac40 Update version number and changelog for 3.3.0 2017-04-05 17:32:17 -07:00