Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 3.3.x into master | Bo Yang | 2017-07-18 | 54 | -88/+259 |
|\ | |||||
| * | Merge pull request #3258 from TeBoring/3.3.xv3.3.23.3.x | Paul Yang | 2017-06-21 | 28 | -30/+46 |
| |\ | | | | | | | Update version number to 3.3.2 | ||||
| | * | Update C++ generated code. | Bo Yang | 2017-06-21 | 13 | -13/+13 |
| | | | |||||
| | * | Update version number to 3.3.2 | Bo Yang | 2017-06-21 | 15 | -17/+33 |
| |/ | |||||
| * | Merge pull request #3255 from TeBoring/3.3.x-3 | Paul Yang | 2017-06-20 | 10 | -7/+28 |
| |\ | | | | | | | Cherry-pick bug fixes for php | ||||
| | * | Remove inclusion of ext/json/php_json.h. (#3241) | Jeff Ching | 2017-06-20 | 1 | -1/+0 |
| | | | | | | | | | | | | That implementation of json is not being used - this extension is using a json encoder/decoder provided by 'upb'. | ||||
| | * | Oneof field should be serialized even it's equal to default. (#3153) | Paul Yang | 2017-06-20 | 3 | -1/+17 |
| | | | |||||
| | * | Add ARRAY for reserved name (#3150) | Paul Yang | 2017-06-20 | 6 | -5/+11 |
| |/ | |||||
| * | Merge pull request #3085 from scpeters/issue_3059 | Feng Xiao | 2017-05-19 | 14 | -0/+59 |
| |\ | | | | | | | Use bool deterministic to suppress warning | ||||
| | * | regenerate plugin and profile message code | Steven Peters | 2017-05-11 | 2 | -0/+4 |
| | | | |||||
| | * | Use bool deterministic to suppress warning | Steven Peters | 2017-05-11 | 13 | -0/+55 |
| | | | | | | | | | | | | Fixes #3059 by re-applying 08b1c718 from #3087. | ||||
| * | | Update jenkins Java deps.v3.3.1 | Feng Xiao | 2017-05-12 | 1 | -1/+1 |
| | | | |||||
| * | | Revert guava depedency to version 19. | Feng Xiao | 2017-05-12 | 3 | -27/+14 |
| |/ | |||||
| * | Add LICENSE in package.xml (#3083) | Paul Yang | 2017-05-11 | 1 | -0/+1 |
| | | |||||
| * | Merge pull request #3074 from xfxyjwf/3.3.x | Feng Xiao | 2017-05-11 | 28 | -30/+46 |
| |\ | | | | | | | Update version number to 3.3.1 | ||||
| | * | Update C++ generated code. | Feng Xiao | 2017-05-08 | 13 | -13/+13 |
| | | | |||||
| | * | Update version number to 3.3.1 | Feng Xiao | 2017-05-08 | 15 | -17/+33 |
| | | | |||||
| * | | Fix upb load descriptor when no messages defined in prorto. (#3080) | Paul Yang | 2017-05-11 | 1 | -0/+3 |
| | | | |||||
| * | | Fix c extension for php7.1. (#3077) | Paul Yang | 2017-05-10 | 4 | -25/+98 |
| |/ | |||||
| * | 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 |
| |/ | |||||
* | | remove pass by reference for php setters (#3344) | Brent Shaffer | 2017-07-17 | 24 | -64/+63 |
| | | | | | | | | | | | | * remove pass by reference for php setters * comments out memory leak test | ||||
* | | Fix Implicit Return Types (#3363) | Richard Fussenegger | 2017-07-17 | 1 | -2/+2 |
| | | | | | | | | | | Both native_slot_merge and native_slot_merge_by_array have no return type declared. GCC implicitly uses int as return type in such cases, however, these functions are actually void. | ||||
* | | Initial value in generated code cannot be used by c extension. (#3367) | Paul Yang | 2017-07-14 | 5 | -2/+35 |
| | | | | | | | | | | | | | | | | | | | | In the generated code of previous versions, each php field is given an initial value. In c extension, it was assumed that the field order in the generated code is consistent with upb fields order, so that the correct initial value can be bound to the correct upb field. However, this may not be true. The order of fields in generated code is decided by proto compiler, while the order of upb fields is decided by the hash function used in c extension. This PR fixes the issue by reset the initial value at runtime. | ||||
* | | removes an accidental newline in printing for the php generator (#3333) | Brent Shaffer | 2017-07-13 | 1 | -1/+1 |
| | | |||||
* | | Add map iterator for c extension (#3350) | Paul Yang | 2017-07-13 | 6 | -5/+157 |
| | | |||||
* | | Add space between arrow and casted type (#3353) | Paul Yang | 2017-07-13 | 3 | -27/+27 |
| | | |||||
* | | Merge pull request #3327 from htuch/fix-3322 | Feng Xiao | 2017-07-13 | 1 | -7/+0 |
|\ \ | | | | | | | Use consistent hash across NDEBUG/!NDEBUG builds. | ||||
| * | | Use consistent hash across NDEBUG/!NDEBUG builds. | Harvey Tuch | 2017-07-07 | 1 | -7/+0 |
| | | | | | | | | | | | | Fixes #3322. | ||||
* | | | Fix repository URL in C# project file | Jon Skeet | 2017-07-13 | 1 | -1/+1 |
| | | | |||||
* | | | C#: Implement IReadOnlyDictionary<K,V> in MapField<K,V> | Jean-Rémy Bancel | 2017-07-12 | 2 | -0/+27 |
| | | | |||||
* | | | Fix missing std::tr1::hash on GCC 4.1 (#2907) | Matt Hauck | 2017-07-10 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | Rather than crashing on use (doh!) better to just declare this platform is missing a proper hash_map/hash_set implementation and use the std::map/std::set emulation. Fixes regression introduced by #1913 | ||||
* | | | Add std:: namespace prefix to set and map (#3332) | tanderson-google | 2017-07-09 | 39 | -84/+82 |
| | | | | | | | | | * Remove using std::{set,map} | ||||
* | | | Uncomment php tests (#3301) | Paul Yang | 2017-07-09 | 2 | -416/+416 |
|/ / | |||||
* | | Merge pull request #2482 from andreaseger/fix_ruby_timestamp_accuracy | Adam Cozzette | 2017-07-06 | 2 | -3/+11 |
|\ \ | | | | | | | [Ruby] fix floating point accuracy problem in Timestamp#to_f | ||||
| * | | change test for nanosecond accurate timestamps | Andreas Eger | 2017-05-13 | 1 | -2/+5 |
| | | | |||||
| * | | fix floating point accuracy problem in Timestamp#to_f | Andreas Eger | 2017-05-13 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | `.quo` return the most exact devision which fixes accuracy problems for the timestamp coercion | ||||
* | | | add Grpc Protobuf validation (#3311) | MaDuo | 2017-07-05 | 1 | -0/+1 |
| | | | | | | | | | * add Grpc Protobuf validation | ||||
* | | | Merge pull request #3315 from thomasvl/mutate_unknowns | Thomas Van Lenten | 2017-07-05 | 2 | -2/+3 |
|\ \ \ | | | | | | | | | Expose the initializer for unknown fields. |