aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Update changelog for 3.4.xJisi Liu2017-08-141-2/+3
|/
* Merge pull request #3485 from pherl/mingwv3.4.0rc3Jisi Liu2017-08-1113-15/+44
|\ | | | | Fix build on MinGW32
| * Fix commentsJisi Liu2017-08-112-1/+2
| |
| * Add malloc castJisi Liu2017-08-111-2/+2
| |
| * implement remove strdup usage and implement our ownJisi Liu2017-08-111-2/+12
| | | | | | | | | | strdup is not part C or C++ standard but POXIS function. Several compilers failed to compile strdup or generate warnings.
| * Adding missing imports for strdupJisi Liu2017-08-111-0/+1
| |
| * Fix mkdirJisi Liu2017-08-111-2/+6
| |
| * Make win32_io only for MSVCJisi Liu2017-08-1112-12/+22
| | | | | | | | | | This excludes cygwin and mingw from using the self implemented functions.
| * Fix the declaration order in ming32Jisi Liu2017-08-111-5/+5
| |
| * Fixing io_win32 for MinGW32Jisi Liu2017-08-111-0/+3
| |
* | Merge pull request #3484 from pherl/qualifierJisi Liu2017-08-111-2/+4
|\ \ | |/ |/| Make compilers without ref-qualifier support happy.
| * Make compilers without ref-qualifier support happy.Jisi Liu2017-08-111-2/+4
|/
* Merge pull request #3481 from pherl/nowarningJisi Liu2017-08-101-12/+7
|\ | | | | Make no warning test stricter.
| * Make no warning test stricter.Jisi Liu2017-08-101-12/+7
| | | | | | | | | | - Now it includes -Wextra except for unused-parameter. - Removed gtest dependency
* | Merge pull request #3478 from pherl/warningJisi Liu2017-08-1016-61/+64
|\| | | | | Make code free of missing-field-initializers warnings
| * Make code free of missing-field-initializers warningsv3.4.0rc2Jisi Liu2017-08-0916-61/+64
|/
* Merge pull request #3461 from TeBoring/3.4.xv3.4.0rc1Jisi Liu2017-08-0746-126/+1627
|\ | | | | Merge master into 3.4.x
| * Merge branch 'master' into 3.4.xBo Yang2017-08-0546-126/+1627
| |\
| | * Update commit id in Dockerfile to reflect change in #3391 (#3459)Paul Yang2017-08-042-2/+2
| | |
| | * Fix the bug in php c extension that setting one field can change ↵Paul Yang2017-08-047-33/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another field's value. (#3455) * Fix the bug in php c extension that setting one field can change another field's value. The reason is that previously, in c extension, it was assumed that the order that fields were declared in php is the same as the order of fields in upb. This is not true. Now, for every field in upb, we will look up the actual property that is corresponding to the upb field. * Cleanup pull request * Fix indentation * Port to php5 * Port with php7.1 * Port to zts
| | * Update PHP descriptors (#3391)michaelbausor2017-08-0417-21/+617
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add descriptors test * Update descriptors tests * Add public descriptors * Add test_desriptors.proto to test script * Update composer files * Remove references to GPBType, update tests to be compatible with c * Update for c extension compatibility * Remove nested enums for descriptor, update tests * Strip leading '.' from descriptor name * Update tests with test for getClass, fix OneofDescriptor * Add new files to Makefile.am
| | * Merge pull request #3456 from giorgioazzinnaro/patch-1Feng Xiao2017-08-041-0/+1
| | |\ | | | | | | | | Update third party addons with ProfaneDB
| | | * Update third party addons with ProfaneDBGiorgio Azzinnaro2017-08-041-0/+1
| | |/ | | | | | | | | | I added my project ProfaneDB, it is a database for Protocol Buffers objects. Written in C++, it uses gRPC as an interface for other languages. It is still work in progress, but I'd love to get some feedback on it while I progress!
| | * Add getClass for php Descriptor in c extension (#3443)Paul Yang2017-08-023-1/+16
| | |
| | * Fixing HHVM Compatibility (#3437)Ryan Gordon2017-08-021-4/+2
| | |
| | * Expose descriptor API in php c extension (#3422)Paul Yang2017-08-028-27/+841
| | |
| | * Change divideInt64ToInt32 to static (#3436)Tony Wong2017-08-011-1/+1
| | | | | | | | | | | | | | | divideInt64ToInt32 is called statically from protobuf/php/src/Google/Protobuf/Internal/CodedOutputStream.php (the only reference) This causes fatal error in PHP 7.1 (32-bit only because 64-bit doesn't use this function)
| | * Removes unnecessary pass-by-references in PHP internal classes (#3433)Brent Shaffer2017-08-013-10/+10
| | |
| | * Merge pull request #3429 from king6cong/masterFeng Xiao2017-07-312-1/+8
| | |\ | | | | | | | | Add classpath for java example Makefile
| | | * Add classpath for java example Makefileking6cong2017-07-312-1/+8
| | |/
| | * Merge pull request #3421 from thomasvl/update_commentThomas Van Lenten2017-07-263-5/+9
| | |\ | | | | | | | | Update the comment on the message_type to cover what it should be.
| | | * Update the comment on the message_type to cover what it should be.Thomas Van Lenten2017-07-263-5/+9
| | |/
| | * Merge pull request #3420 from thomasvl/objc_proto2_conformanceThomas Van Lenten2017-07-263-23/+26
| | |\ | | | | | | | | Objc proto2 conformance test support
| | | * Review feedback.Thomas Van Lenten2017-07-261-8/+6
| | | | | | | | | | | | | | | | | | | | - Better error message for unknown messageType. - Remove unneeded if.
| | | * Add the proto2 message conformance support for ObjC.Thomas Van Lenten2017-07-261-10/+12
| | | |
| | | * Generate the proto2 test file and link it in for ObjC.Thomas Van Lenten2017-07-261-9/+11
| | | |
| | | * Add a objc_class_prefix to test_messages_proto3.proto.Thomas Van Lenten2017-07-262-3/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Both test_messages_proto3.proto & test_messages_proto2.proto define message ForeignMessage {...} and enum ForeignEnum {...} but since objc doesn't use the proto package in the naming, these end up conflicting. Adding the objc_class_prefix option to the proto3 file ensure the generated objc types are all unique.
| | * Merge pull request #3410 from adam-26/1745Adam Cozzette2017-07-251-0/+1
| | |\ | | | | | | | | Fix issue #1745 - javascript allow dot in filename
| | | * Fix quotation marksAdam2017-07-241-1/+1
| | | |
| | | * Fix issue #1745 - javascript allow dot in filenameAdam2017-07-241-0/+1
| | | |
* | | | Merge pull request #3468 from vladmos/3.4.xFeng Xiao2017-08-071-3/+3
|\ \ \ \ | |/ / / |/| | | Make .bzl files compatible with future versions of Bazel
| * | | Make .bzl files compatible with future versions of BazelVladimir Moskva2017-08-071-3/+3
|/ / /
* | | Merge pull request #3450 from pherl/invalidoffsetJisi Liu2017-08-0315-144/+315
|\ \ \ | | | | | | | | Fix invalid offsetof warning.
| * | | Fix invalid offsetof warning.Jisi Liu2017-08-0315-144/+315
| | | | | | | | | | | | | | | | Use composition instead of inheritance for oneof default.
* | | | Merge pull request #3451 from pherl/fixtypoJisi Liu2017-08-031-1/+1
|\ \ \ \ | |/ / / |/| | | Fix typo.
| * | | Fix typo.Jisi Liu2017-08-031-1/+1
|/ / /
* | | Add destructors for default instances to the shutdown code.Gerben Stavenga2017-08-0216-73/+152
| | | | | | | | | | | | Verified test succeed under draconian heap checker
* | | Merge pull request #3442 from pherl/csharpversionJisi Liu2017-08-021-1/+1
|\ \ \ | | | | | | | | Bump csharp version
| * | | Bump csharp versionJisi Liu2017-08-021-1/+1
| | | |
* | | | Merge pull request #3438 from pherl/changelogJisi Liu2017-08-021-0/+128
|\| | | | | | | | | | | Update change log