aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4702 from TeBoring/3.6.xv3.6.0rc2Paul Yang2018-05-302-5/+26
|\ | | | | Cherry-pick changes into 3.6.x
| * Move methods out of class (#4697)Paul Yang2018-05-302-15/+26
| |
| * Add back GeneratedClassName to public (#4686)Paul Yang2018-05-301-0/+10
| | | | | | These methods are used by grpc
* | Merge pull request #4696 from acozzette/csharp-fixAdam Cozzette2018-05-301-4/+0
|\ \ | |/ |/| Removed duplicate using statement from ReflectionUtil.cs
| * Removed duplicate using statement from ReflectionUtil.csAdam Cozzette2018-05-291-4/+0
| |
* | Merge pull request #4695 from TeBoring/3.6.xPaul Yang2018-05-292-4/+18
|\ \ | |/ |/| Fix php memory leak test (#4692)
| * Fix php memory leak test (#4692)Paul Yang2018-05-292-4/+18
|/
* Merge pull request #4687 from acozzette/js-map-parsing-fixAdam Cozzette2018-05-254-6/+87
|\ | | | | Fixed JS parsing of unspecified map keys
| * Fixed JS parsing of unspecified map keysAdam Cozzette2018-05-254-6/+87
|/ | | | | | | | | We need to use a default of 0 when parsing unspecified map keys, instead of failing an assertion. This change was written by Michael Aaron (michaelaaron@google.com) but I am cherry-picking it directly instead of waiting for the next sync of Google-internal changes.
* Always add -std=c++11 for mac (#4684)Paul Yang2018-05-251-4/+2
|
* Merge pull request #4675 from TeBoring/3.6.xPaul Yang2018-05-25101-832/+2738
|\ | | | | Cherry-pick php generated code changes into 3.6.x
| * Fix array constructor in c extension for compatibility (#4667)Paul Yang2018-05-251-3/+3
| | | | | | | | | | In old generated code, the constructor of message doesn't provide a default null to parent's constructor. Previously, in c extesnion, this case was not handled.
| * PHP namespaces for nested messages and enums (#4536)Brent Shaffer2018-05-2577-657/+1477
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * uses namespaces for nested messages and enums * fixes namespaces for PHP dist * fixes namespace for Descriptors, adds Cardinality and Kind * fixes nested namespaces for reserved words and adds tests * adds tests and generator fix for php class prefixes * fixes escaping of protobuf packages, enum comments, misc others * nice refactor of generated code * adds class files for backwards compatibility * simplifies code with templates * adds compatibility files to makefile * cleanup of generator and fixes nested namespace bug * regenerates proto types * remove internal BC classes * adds deprecated warning, adds methods back * simplifies if statement * fixes dist files * addresses review comments * adds back TYPE_URL_PREFIX constant * adds @deprecated to old nested class files * skips tests which require a separate process when protobuf.so is enabled * Adds tests for legacy nested classes that do not require separate processes to test * uses legacy names for GPBUtil message check * adds block for IDE @deprecated message * Namespace for nested message/enum in c extension * Remove unused code
| * Implement array constructor in php c extension.Bo Yang2018-05-253-85/+173
| |
| * PHP array constructors for protobuf messages (#4530)Brent Shaffer2018-05-2531-161/+1082
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP array constructors for protobuf messages * removes Descriptor from error message * allows mergeFrom to accept an array * only use initWithDescriptor if instanceof MapEntry * adds doc comments * removes ability for constructors to take arrays for submessages * Revert "allows mergeFrom to accept an array" This reverts commit b7b72182d561634af12c5c5c56a7cda3b33241f9. * makes mergeFromArray protected and fixes mergeFrom whitespace * Separates merging from JSON and merging from PHP array * removes well-known types and json keys from array construction * Addresses PR review comments * cleans up tests * fixes exception messages
| * Add missing ruby/tests/test_ruby_package.protoBo Yang2018-05-251-0/+1
| |
| * Allows the json marshaller to be passed json marshal options (#4252)Erik Benoist2018-05-253-4/+28
| |
| * Adopt ruby_package in ruby generated code. (#4627)Paul Yang2018-05-255-3/+31
| | | | | | | | | | | | * Adopt ruby_package in ruby generated code. * Add test for ruby_package
| * Adopt php_metadata_namespace in php code generator (#4622)Paul Yang2018-05-254-17/+41
|/ | | | | | | | | | | * Adopt php_metadata_namespace in php code generator The php_metadata_namespace is corresponded to the relative directory of the metadata file. e.g., previously, the metadata file of foo.proto was GPBMetadata/Foo.php. If the php_metadata_namespace is "Metadata\\Bar", the metadata file will be Metadata/Bar/Foo.php. * Handle empty php_metadata_namespace
* Merge pull request #4673 from acozzette/memory-leak-fixv3.6.0rc1Adam Cozzette2018-05-241-8/+6
|\ | | | | Make sure to delete temporary maps used by FileDescriptorTables
| * Make sure to delete temporary maps used by FileDescriptorTablesAdam Cozzette2018-05-241-8/+6
|/ | | | | | | I ran the tcmalloc heap checker in draconian mode, and it reported some heap allocations that were still reachable when protobuf-test exited. To fix that, I updated FileDescriptorTables to make sure its temporary heap-allocated maps are deleted when it is destroyed.
* Merge pull request #4625 from liujisi/3.6.xJisi Liu2018-05-1525-43/+43
|\ | | | | Update version number to 3.6.0
| * Update version number to 3.6.0Jisi Liu2018-05-1425-43/+43
|/
* Add file option php_metadata_namespace and ruby_package (#4609)Paul Yang2018-05-116-222/+751
|
* Merge pull request #4538 from Mizux/patch-2Feng Xiao2018-05-102-8/+20
|\ | | | | Add .proto files to extract_includes.bat
| * fix duplicate mkdir in update_file_lists.shCorentin Le Molgat2018-04-252-21/+7
| | | | | | | | | | - merge loop for .h and .proto includes - fix shellcheck errors
| * Add .proto files to extract_includes.batMizux2018-04-242-0/+26
| | | | | | | | | | For google/or-tools, on windows, we need to use `import "google/protobuf/wrappers.proto";` since we want "optional" int64 and in version3 POD get default value... -> so we use "google.protobuf.Int64Value" since 0 is a valid value and different from "not set" for our use case.
* | Throw error if user want to access message properties (#4603)Paul Yang2018-05-102-2/+8
| | | | | | | | | | | | * Throw error if user want to access message properties * Fix typo
* | Avoid direct check of class name (#4601)Paul Yang2018-05-101-7/+3
| | | | | | | | | | | | | | | | * Avoid direct check of class name So that subclasses are also ok * Use type hint in function signature.
* | use brew install instead of easy_install in OSX (#4537)Jie Luo2018-05-091-1/+2
| | | | | | use brew instead of easy_install in OSX (easy_install keep failing for a month)
* | Merge pull request #4590 from PetterS/undefined_fixFeng Xiao2018-05-061-4/+6
|\ \ | | | | | | Fix error in Clang UndefinedBehaviorSanitizer
| * | Fix error in Clang UndefinedBehaviorSanitizerPetter Strandmark2018-05-041-4/+6
|/ / | | | | | | | | | | Pointer Arguments to memcpy can not be null in UndefinedBehaviorSanitizer. In this case, both the memory and the size was zero. This change allows protoc to run under UndefinedBehaviorSanitizer.
* | Add VS2017 optional component dependency details to the C# readme (#4128)David Chennells2018-05-031-0/+6
| | | | | | Add mention to the "Build" section of the ReadMe of the requirement of installing an optional component to VS2017.
* | Fix python ext build on kokoro (#4527)Yilun Chong2018-05-031-0/+2
| |
* | Merge pull request #4586 from chronoxor/masterFeng Xiao2018-05-021-1/+1
|\ \ | | | | | | Fix MinGW build
| * | MinGW build failedIvan Shynkarenka2018-05-021-1/+1
|/ /
* | Merge pull request #4583 from chronoxor/masterFeng Xiao2018-05-011-4/+8
|\ \ | | | | | | Fix CMake build on Cygwin.
| * | Cygwin build failedIvan Shynkarenka2018-05-021-4/+8
|/ /
* | Fix RepeatedField#delete_if (#4292)Stuart Campbell2018-04-302-2/+11
| | | | | | Make RepeatedField#delete_if consistent with Array#delete_if.
* | Add space between class name and concat message (#4577)Petar Dambovaliev2018-04-301-1/+1
| | | | | | | | The class name was linked to the next word in the sentence. "User\UserRequestis not found in descriptor pool."
* | Merge pull request #4581 from Yeolar/3rd_rpc_rasterFeng Xiao2018-04-301-0/+1
|\ \ | | | | | | Add a third-party RPC implementation: raster
| * | Add third-party RPC implementation: raster - a network framework supports ↵Yeolar2018-04-301-0/+1
| | | | | | | | | | | | pbrpc by 'service' keyword.
* | | [objectivec] Fix memory leak of exceptions raised by RaiseException() (#4556)Hiroshi Ichikawa2018-04-301-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | * Fix memory leak of exceptions raised by RaiseException() Currently exceptions raised by RaiseException() is never deallocated because: * ARC is disabled for this library: https://github.com/google/protobuf/blob/master/BUILD#L913 * It is constructed with `+alloc` but is never `-release`d. This change fixes the issue by using `-[NSException exceptionWithName:...]` instead, which returns an autoreleased instance, so it is deallocated properly. * Fix format.
* | Merge pull request #4568 from hectim/masterFeng Xiao2018-04-271-1/+1
|\ \ | | | | | | fixed typo
| * | typoBrady Killeen2018-04-261-1/+1
| | |
* | | Merge pull request #4550 from Mizux/masterFeng Xiao2018-04-271-3/+5
|\ \ \ | | | | | | | | CMake: Update CXX Standard management
| * | | CMake: Update CXX Standard managementCorentin Le Molgat2018-04-241-3/+5
| | | |
* | | | Fix to allow AOT compilers to play nicely with reflectionJon Skeet2018-04-272-18/+47
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this fix, Unity using IL2CPP should work with one of two approaches: - Call `FileDescriptor.ForceReflectionInitialization<T>` for every enum present in generated code (including oneof case enums) - Ensure that IL2CPP uses the same code for int and any int-based enums The former approach is likely to be simpler, unless IL2CPP changes its default behavior. We *could* potentially generate the code automatically, but that makes me slightly uncomfortable in terms of generating code that's only relevant in one specific scenario. It would be reasonably easy to write a tool (separate from protoc) to generate the code required for any specific set of assemblies, so that Unity users can include it in their application. We can always decide to change to generate it automatically later.
* | | Merge pull request #4553 from pherl/rubyJisi Liu2018-04-251-0/+6
|\ \ \ | |/ / |/| | Set ext.no_native = true for non mac platform
| * | Set ext.no_native = true for non mac platformJisi Liu2018-04-251-0/+6
|/ / | | | | | | | | From: https://github.com/rake-compiler/rake-compiler/issues/146#issuecomment-368539245
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-09 18:02:42 +0000