aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Updated PHP generated code for timestamp.protoAdam Cozzette2018-05-171-3/+5
|
* re-write int128 long division to avoid license impact from stackoverflow ↵NickFengIBM2018-05-171-34/+18
| | | | | | | references (#4633) * rewrite int128 long divison to avoid stackoverflow hit Protobuf was showing Stackoverflow hits in the code base, primarily code written to calculate long division. This code was copied from a stackoverflow post, which means it would be licensed under CC BY-SA 3.0. Due to this license, IBM Legal did not want to include this OSS in our products and advised us to re-write this particular piece of code to avoid the license restriction. We have re-written the code for our own distribution, and are willing to merge it into the main code base for others who want to avoid the stackoverflow license issues to benefit as well.
* Merge pull request #4619 from ccvca/cmake_protobuf_generate_changesFeng Xiao2018-05-171-8/+12
|\ | | | | cmake: protobuf_generate fix GENERATE_EXTENSIONS, fix DEPENDS, add PROTOC_OUT_DIR
| * cmake: Fix DEPENDS of add_custom_command in protobuf_generateChristian von Arnim2018-05-151-1/+1
| |
| * cmake: Add parameter PROTOC_OUT_DIR to protobuf_generateChristian von Arnim2018-05-141-3/+7
| |
| * cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generateChristian von Arnim2018-05-141-4/+4
| |
* | Merge pull request #4631 from banshee/fix_4615Adam Cozzette2018-05-161-1/+1
|\ \ | | | | | | Fix 4615
| * | Don't look for sched_yield on Android.James Moore2018-05-161-1/+1
| | | | | | | | | | | | | | | | | | The problem is that sched_yield is available on the target, but configure.ac is asking to build a host binary using the AC_SEARCH_LIBS macro. It can't configure for Android, since sched_yield isn't available on the host.
* | | Merge pull request #4624 from eughermann/hash-ub-fixAdam Cozzette2018-05-151-7/+7
|\ \ \ | | | | | | | | Fix undefined behavior in hash function.
| * | | Remove undefined behavior from the hash function.Eugene Hermann2018-05-141-7/+7
| | |/ | |/| | | | | | | | | | | | | Signed integer overflow creates undefined behavior that may lead to unpredictable fails on different platforms. One known example of the hardware where this code did fail is Apple A6 (32-bit Apple Swift CPU) 16777619, 16777499 - two prime numbers that typically used to get better dispersion.
* | | Merge pull request #4632 from chronoxor/masterFeng Xiao2018-05-154-0/+8
|\ \ \ | | | | | | | | Fix issue with version.rc
| * | | Fix issue with version.rcIvan Shynkarenka2018-05-154-0/+8
|/ / /
* | | Merge pull request #4574 from jozefizso/patch-1Feng Xiao2018-05-151-3/+3
|\ \ \ | |_|/ |/| | Fix appveyor documentation
| * | Fix appveyor documentationJozef Izso2018-05-151-3/+3
|/ /
* | Merge pull request #4623 from BSBandme/fix_kokoro_benchmark_buildYilun Chong2018-05-141-2/+3
|\ \ | | | | | | Fix python install, cat java error log for kokoro build
| * | Fix python install, cat java error log for kokoro buildYilun Chong2018-05-141-2/+3
| | |
* | | Adopt php_metadata_namespace in php code generator (#4622)Paul Yang2018-05-144-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 #4579 from jozefizso/dev/3380_version_infoFeng Xiao2018-05-147-4/+80
|\ \ \ | | | | | | | | Include version information in Windows binaries #3380
| * | | Include version.rc.in in distribution packageJozef Izso2018-04-281-0/+1
| | | |
| * | | Include file information in all DLL and EXE outputsJozef Izso2018-04-284-5/+20
| | | |
| * | | Add file information to Windows binariesJozef Izso2018-04-274-3/+63
| | | |
* | | | enable source link for csharp (#4179)Cameron Taggart2018-05-142-3/+5
| | | |
* | | | Merge pull request #4587 from chronoxor/masterFeng Xiao2018-05-143-6/+26
|\ \ \ \ | | | | | | | | | | Appveyor MinGW build
| * | | | Appveyor MinGW buildIvan Shynkarenka2018-05-033-6/+26
| | | | |
* | | | | Merge pull request #4611 from anuraaga/remove-string-moveFeng Xiao2018-05-142-35/+2
|\ \ \ \ \ | | | | | | | | | | | | [Java] Remove unsafe no-copy String allocation since it's not useful in rece…
| * | | | | Remove unsafe no-copy String allocation since it's not useful in recent Java ↵Anuraag Agrawal2018-05-112-35/+2
| | |_|/ / | |/| | | | | | | | | | | | | versions.
* | | | | fix index out of range error in C# generation using msvc (#1329)Warren Falk2018-05-141-1/+1
| |_|_|/ |/| | |
* | | | 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