Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3413 from pherl/3.4.x | Jisi Liu | 2017-07-25 | 24 | -42/+42 |
|\ | | | | | Update version number for 3.4.0 | ||||
| * | Merge remote-tracking branch 'origin/3.4.x' into vb | Jisi Liu | 2017-07-24 | 3 | -23/+36 |
| |\ | |/ |/| | |||||
* | | Merge pull request #3414 from pherl/fixzip | Jisi Liu | 2017-07-24 | 1 | -22/+32 |
|\ \ | | | | | | | Omit the zip test if tools are not available | ||||
| * | | Omit the zip test if tools are not available | Jisi Liu | 2017-07-24 | 1 | -22/+32 |
| | | | |||||
* | | | Merge pull request #3412 from anandolee/3.4.x | Jisi Liu | 2017-07-24 | 2 | -1/+4 |
|\ \ \ | |/ / |/| | | Use keys() instead of iterkeys() to be python3 compatbile. | ||||
| * | | Add __bool__ as well as __nonzero__ for python3 | Jie Luo | 2017-07-24 | 1 | -0/+3 |
| | | | |||||
| * | | Use keys() instead of iterkeys() to be python3 compatbile. | Jie Luo | 2017-07-24 | 1 | -1/+1 |
|/ / | |||||
| * | Update required version on pre-generated files | Jisi Liu | 2017-07-24 | 12 | -12/+12 |
| | | |||||
| * | Update pre generated files | Jisi Liu | 2017-07-24 | 12 | -12/+12 |
| | | |||||
| * | Update version number for 3.4.0 | Jisi Liu | 2017-07-24 | 12 | -18/+18 |
|/ | |||||
* | Merge pull request #3393 from pherl/3.4.x | Jisi Liu | 2017-07-24 | 308 | -8120/+20323 |
|\ | | | | | Create 3.4.x branch | ||||
| * | Fix code to use values() instead | Jisi Liu | 2017-07-19 | 1 | -1/+1 |
| | | |||||
| * | Update filelist again | Jisi Liu | 2017-07-19 | 1 | -0/+1 |
| | | |||||
| * | Add lite and python extra_dist files | Jisi Liu | 2017-07-19 | 1 | -0/+4 |
| | | |||||
| * | Add java and JS dist files. | Jisi Liu | 2017-07-19 | 1 | -0/+23 |
| | | |||||
| * | remove broken imports in JS | Jisi Liu | 2017-07-19 | 1 | -2/+0 |
| | | |||||
| * | Use itmes() instead of itervalues() to be python3 compatbile. | Jisi Liu | 2017-07-19 | 1 | -1/+1 |
| | | |||||
| * | Fix distcheck | Jisi Liu | 2017-07-19 | 1 | -0/+1 |
| | | |||||
| * | remove profile | Jisi Liu | 2017-07-19 | 4 | -2239/+0 |
| | | |||||
| * | update build file list | Jisi Liu | 2017-07-19 | 2 | -3/+1 |
| | | |||||
| * | Update conformance tests | Jisi Liu | 2017-07-19 | 5 | -1184/+6 |
| | | |||||
| * | Merge master into 3.4.x | Jisi Liu | 2017-07-18 | 328 | -7456/+12078 |
| |\ | |/ |/| | |||||
* | | Merge pull request #3390 from danielgtaylor-isp/patch-1 | Feng Xiao | 2017-07-18 | 1 | -0/+4 |
|\ \ | | | | | | | Add note about includes to README | ||||
| * | | Add note about includes to README | Daniel Taylor | 2017-07-18 | 1 | -0/+4 |
| | | | | | | | | | Ran into an issue today where a machine had the `protoc` compiler but not the include files. Took a while to sort out, and this added note to the README included in every zip should help. | ||||
* | | | Merge pull request #3385 from anandolee/master | Jie Luo | 2017-07-18 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance | ||||
| * | | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance test | Jie Luo | 2017-07-17 | 1 | -0/+1 |
| | | | |||||
* | | | Support PHP generic services (#3269) | Matt A | 2017-07-18 | 14 | -191/+623 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add php_generic_services option * Generate PHP generic services * Respect namespaces for generated PHP services * Test PHP generated services * Rename PHP generator service method doc comment function * Correct phpdoc service method case * Test namespaced PHP generic services * Always use the FQCN for PHP generic service input/output * Add generated_service_test to php test.sh * Add php service test protos to CI * Add php service files to php_EXTRA_DIST * Use Interface suffix for php generic services | ||||
* | | Merge pull request #3348 from matthauck/fix-gcc41-again | Adam Cozzette | 2017-07-17 | 1 | -2/+2 |
|\ \ | | | | | | | Fix map_field_inl.h for gcc 4.1 | ||||
| * | | Fix map_field_inl.h for gcc 4.1 | Matt Hauck | 2017-07-11 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #3357 from bklarson/master | Adam Cozzette | 2017-07-17 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Fix build when using -Werror=undef | ||||
| * | | | Fix build when using -Werror=undef | Brad Larson | 2017-07-12 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a couple places where macros were being checked when they might not exist in some cases. Fixes #3356. | ||||
* | | | | Merge pull request #3134 from lundefugl/javabug1 | Feng Xiao | 2017-07-17 | 2 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Issue 3112: Object class with fully qualified name | ||||
| * | | | | Issue 3112: Object class with fully qualified name | lundefugl | 2017-05-24 | 2 | -5/+5 |
| | | | | | |||||
* | | | | | Merge pull request #3372 from dylanetaft/master | Adam Cozzette | 2017-07-17 | 1 | -1/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Expand documentation in Readme.md | ||||
| * | | | | | Expand documentation in Readme.md | dylanetaft | 2017-07-15 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | Add some supporting documentation regarding Closure for those unfamiliar., Also substantiate details for "files in this directory" - including them all will result in a project that does not compile as some are used for test cases and aren't part of the core library. | ||||
* | | | | | | 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 |
| | | | |