Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3073 from xfxyjwf/3.3.x | Feng Xiao | 2017-05-08 | 1 | -1/+2 |
|\ | | | | | Cherry-pick a bug fix: workaround gcc < 4.5.0 bug | ||||
| * | Workaround gcc < 4.5.0 bug | Mario J. Rugiero | 2017-05-08 | 1 | -1/+2 |
| | | | | | | | | | | | | See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=189 Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com> | ||||
* | | Merge pull request #3064 from randomguy3/offset-type | Feng Xiao | 2017-05-08 | 1 | -1/+1 |
|\ \ | |/ |/| | Fix offset type macro to match the tables it is used in | ||||
| * | Fix compilation | randomguy3 | 2017-05-06 | 1 | -1/+1 |
| | | | | | | <: is a digraph, so a space is necessary for compilation on certain compilers. | ||||
| * | Fix offset type to match the tables it is used in | Alex Merry | 2017-05-05 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3057 from xfxyjwf/3.3.x | Feng Xiao | 2017-05-05 | 7 | -5/+18 |
|\ | | | | | Fix several C++ build issues. | ||||
| * | Add missing LIBRPOTOC_EXPORT. | Feng Xiao | 2017-05-04 | 1 | -2/+2 |
| | | |||||
| * | Skip C# test in C++ only distribution. | Feng Xiao | 2017-05-04 | 1 | -0/+8 |
| | | |||||
| * | Add missing files to build files. | Feng Xiao | 2017-05-04 | 5 | -3/+8 |
| | | |||||
* | | Merge pull request #3056 from acozzette/cherry-pick-pr-2873 | Adam Cozzette | 2017-05-05 | 3 | -14/+14 |
|\ \ | |/ |/| | Cherry-pick the fix from pull request #2873 | ||||
| * | Fix #1562 by using goog.crypt.byteArrayToString instead of ↵ | Paul Jolly | 2017-05-04 | 3 | -14/+14 |
|/ | | | | String.fromCharCode.apply | ||||
* | Merge pull request #3055 from chrisn-arm/3.3.x | Feng Xiao | 2017-05-04 | 1 | -0/+7 |
|\ | | | | | Fix compilation on alpine 3.5 | ||||
| * | Fix issue 3046: compilation on alpine 3.5 | Chris Nix | 2017-05-04 | 1 | -0/+7 |
|/ | |||||
* | Add prefix to enum value with reserved name. (#3020)v3.3.0 | Paul Yang | 2017-04-26 | 2 | -4/+5 |
| | |||||
* | Add a test case for nested enum, which was missed previously. (#3010) | Paul Yang | 2017-04-25 | 1 | -0/+1 |
| | |||||
* | Add nested enum descriptor in php rumtime. (#3009)v3.3.0rc1 | Paul Yang | 2017-04-24 | 3 | -1/+11 |
| | |||||
* | Update php version number to 3.3.0 (#3001) | Paul Yang | 2017-04-24 | 2 | -6/+22 |
| | |||||
* | Throw exception when parsing invalid data. (#3000) | Paul Yang | 2017-04-21 | 6 | -49/+297 |
| | |||||
* | Merge pull request #2996 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-20 | 1 | -1/+1 |
|\ | | | | | Fix python3 issue. | ||||
| * | Fix python3 issue. | Feng Xiao | 2017-04-20 | 1 | -1/+1 |
| | | |||||
* | | Allow proto files to import descriptor.proto (#2995) | Paul Yang | 2017-04-20 | 8 | -5/+51 |
|/ | | | | | | | | | 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. | ||||
* | Prepend "PB" to generated classes whose name are reserved words. (#2990) | Paul Yang | 2017-04-20 | 8 | -61/+163 |
| | |||||
* | Add test for nested enum for php (#2989) | Paul Yang | 2017-04-19 | 4 | -0/+22 |
| | |||||
* | Enum defined without package have incorrect class name. (#2988) | Paul Yang | 2017-04-19 | 5 | -53/+54 |
| | | | | Fix the bug by sharing the code for generating class name for both message and enum. | ||||
* | Make PHP c extension work with PHP7 (#2951) | Paul Yang | 2017-04-19 | 23 | -1187/+1891 |
| | |||||
* | Merge pull request #2967 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-11 | 8 | -4/+528 |
|\ | | | | | Fix map serialization | ||||
| * | Cherry-pick cl/152450543 | Feng Xiao | 2017-04-11 | 8 | -2/+472 |
| | | |||||
| * | Cherry-pick cl/151775298 | Feng Xiao | 2017-04-11 | 2 | -2/+56 |
|/ | |||||
* | Merge pull request #2955 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-11 | 1 | -0/+1 |
|\ | | | | | Add include for INT_MAX | ||||
| * | Add include for INT_MAX | Feng Xiao | 2017-04-08 | 1 | -0/+1 |
| | | |||||
* | | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962) | Jie Luo | 2017-04-10 | 4 | -8/+45 |
|/ | | | | | | * Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject() * Cherrypick the fix descriptor_pool.FindFileContainingSymbol by extensions. | ||||
* | Merge pull request #2949 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-07 | 2 | -0/+10 |
|\ | | | | | Cleanup reflection objects for map entry. | ||||
| * | Cleanup reflection objects for map entry. | Feng Xiao | 2017-04-06 | 2 | -0/+10 |
| | | |||||
* | | Merge pull request #2942 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-06 | 24 | -42/+150 |
|\| | | | | | Update version number and changelog for 3.3.0 | ||||
| * | Update generated code. | Feng Xiao | 2017-04-05 | 13 | -26/+26 |
| | | |||||
| * | Update version number and changelog for 3.3.0 | Feng Xiao | 2017-04-05 | 11 | -16/+124 |
|/ | |||||
* | Update Java conformance failure list. | Feng Xiao | 2017-03-31 | 1 | -1/+0 |
| | |||||
* | Use "git reset --hard" to actually reset the code. | Feng Xiao | 2017-03-31 | 2 | -3/+3 |
| | |||||
* | Update jenkins Java dependencies. | Feng Xiao | 2017-03-31 | 1 | -1/+1 |
| | |||||
* | Update Java version number and dependency. | Feng Xiao | 2017-03-30 | 3 | -4/+10 |
| | |||||
* | Update objective-c conformance failure list. | Feng Xiao | 2017-03-30 | 1 | -2/+4 |
| | |||||
* | Fix C++ distcheck. | Feng Xiao | 2017-03-30 | 1 | -0/+2 |
| | |||||
* | Fix MSVC DLL build. | Feng Xiao | 2017-03-30 | 6 | -8/+10 |
| | |||||
* | Update python conformance failure list. | Feng Xiao | 2017-03-30 | 1 | -3/+0 |
| | |||||
* | Update jenkins Java maven dependencies. | Feng Xiao | 2017-03-30 | 1 | -1/+1 |
| | |||||
* | Update C# conformance failure list. | Feng Xiao | 2017-03-29 | 1 | -0/+4 |
| | |||||
* | Update python conformance failure list. | Feng Xiao | 2017-03-29 | 2 | -1181/+0 |
| | |||||
* | Fix Java build. | Feng Xiao | 2017-03-29 | 4 | -4/+11 |
| | |||||
* | Update BUILD file for C# tests. | Feng Xiao | 2017-03-29 | 1 | -0/+4 |
| | |||||
* | Fix C++ build for down-integration. | Feng Xiao | 2017-03-29 | 8 | -49/+134 |
| |