aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* compiles removal of newline (#3333) (#3370)Brent Shaffer2017-07-1925-25/+0
|
* Merge pull request #3375 from TeBoring/3.3.xPaul Yang2017-07-1954-88/+259
|\ | | | | Merge 3.3.x into master
| * Merge 3.3.x into masterBo Yang2017-07-1854-88/+259
| |\
| | * Merge pull request #3258 from TeBoring/3.3.xv3.3.23.3.xPaul Yang2017-06-2128-30/+46
| | |\ | | | | | | | | Update version number to 3.3.2
| | | * Update C++ generated code.Bo Yang2017-06-2113-13/+13
| | | |
| | | * Update version number to 3.3.2Bo Yang2017-06-2115-17/+33
| | |/
| | * Merge pull request #3255 from TeBoring/3.3.x-3Paul Yang2017-06-2010-7/+28
| | |\ | | | | | | | | Cherry-pick bug fixes for php
| | | * Remove inclusion of ext/json/php_json.h. (#3241)Jeff Ching2017-06-201-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 Yang2017-06-203-1/+17
| | | |
| | | * Add ARRAY for reserved name (#3150)Paul Yang2017-06-206-5/+11
| | |/
| | * Merge pull request #3085 from scpeters/issue_3059Feng Xiao2017-05-1914-0/+59
| | |\ | | | | | | | | Use bool deterministic to suppress warning
| | | * regenerate plugin and profile message codeSteven Peters2017-05-112-0/+4
| | | |
| | | * Use bool deterministic to suppress warningSteven Peters2017-05-1113-0/+55
| | | | | | | | | | | | | | | | Fixes #3059 by re-applying 08b1c718 from #3087.
| | * | Update jenkins Java deps.v3.3.1Feng Xiao2017-05-121-1/+1
| | | |
| | * | Revert guava depedency to version 19.Feng Xiao2017-05-123-27/+14
| | |/
| | * Add LICENSE in package.xml (#3083)Paul Yang2017-05-111-0/+1
| | |
| | * Merge pull request #3074 from xfxyjwf/3.3.xFeng Xiao2017-05-1128-30/+46
| | |\ | | | | | | | | Update version number to 3.3.1
| | | * Update C++ generated code.Feng Xiao2017-05-0813-13/+13
| | | |
| | | * Update version number to 3.3.1Feng Xiao2017-05-0815-17/+33
| | | |
| | * | Fix upb load descriptor when no messages defined in prorto. (#3080)Paul Yang2017-05-111-0/+3
| | | |
| | * | Fix c extension for php7.1. (#3077)Paul Yang2017-05-104-25/+98
| | |/
| | * Merge pull request #3073 from xfxyjwf/3.3.xFeng Xiao2017-05-081-1/+2
| | |\ | | | | | | | | Cherry-pick a bug fix: workaround gcc < 4.5.0 bug
| | | * Workaround gcc < 4.5.0 bugMario J. Rugiero2017-05-081-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-typeFeng Xiao2017-05-081-1/+1
| | |\ \ | | | |/ | | |/| Fix offset type macro to match the tables it is used in
| | | * Fix compilationrandomguy32017-05-061-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 inAlex Merry2017-05-051-1/+1
| | |/
| | * Merge pull request #3057 from xfxyjwf/3.3.xFeng Xiao2017-05-057-5/+18
| | |\ | | | | | | | | Fix several C++ build issues.
| | | * Add missing LIBRPOTOC_EXPORT.Feng Xiao2017-05-041-2/+2
| | | |
| | | * Skip C# test in C++ only distribution.Feng Xiao2017-05-041-0/+8
| | | |
| | | * Add missing files to build files.Feng Xiao2017-05-045-3/+8
| | | |
| | * | Merge pull request #3056 from acozzette/cherry-pick-pr-2873Adam Cozzette2017-05-053-14/+14
| | |\ \ | | | |/ | | |/| Cherry-pick the fix from pull request #2873
| | | * Fix #1562 by using goog.crypt.byteArrayToString instead of ↵Paul Jolly2017-05-043-14/+14
| | |/ | | | | | | | | | String.fromCharCode.apply
| | * Merge pull request #3055 from chrisn-arm/3.3.xFeng Xiao2017-05-041-0/+7
| | |\ | | | | | | | | Fix compilation on alpine 3.5
| | | * Fix issue 3046: compilation on alpine 3.5Chris Nix2017-05-041-0/+7
| | |/
* | | Merge pull request #3390 from danielgtaylor-isp/patch-1Feng Xiao2017-07-181-0/+4
|\ \ \ | | | | | | | | Add note about includes to README
| * | | Add note about includes to READMEDaniel Taylor2017-07-181-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/masterJie Luo2017-07-181-0/+1
|\ \ \ \ | |/ / / |/| | | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance
| * | | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance testJie Luo2017-07-171-0/+1
| | | |
* | | | Support PHP generic services (#3269)Matt A2017-07-1814-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-againAdam Cozzette2017-07-171-2/+2
|\ \ \ | | | | | | | | Fix map_field_inl.h for gcc 4.1
| * | | Fix map_field_inl.h for gcc 4.1Matt Hauck2017-07-111-2/+2
| | | |
* | | | Merge pull request #3357 from bklarson/masterAdam Cozzette2017-07-172-2/+2
|\ \ \ \ | | | | | | | | | | Fix build when using -Werror=undef
| * | | | Fix build when using -Werror=undefBrad Larson2017-07-122-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/javabug1Feng Xiao2017-07-172-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Issue 3112: Object class with fully qualified name
| * | | | | Issue 3112: Object class with fully qualified namelundefugl2017-05-242-5/+5
| | | | | |
* | | | | | Merge pull request #3372 from dylanetaft/masterAdam Cozzette2017-07-171-1/+9
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Expand documentation in Readme.md
| * | | | | Expand documentation in Readme.mddylanetaft2017-07-151-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 Shaffer2017-07-1724-64/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove pass by reference for php setters * comments out memory leak test
* | | | | | Fix Implicit Return Types (#3363)Richard Fussenegger2017-07-171-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 Yang2017-07-145-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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 17:41:34 +0000