Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5001 from acozzette/backport-spelling-fix3.5.x | Adam Cozzette | 2018-08-03 | 1 | -1/+1 |
|\ | | | | | Fix spelling error of __GNUC_MINOR__ | ||||
| * | Fix spelling error of __GNUC_MINOR__ | Adam Aili | 2018-08-03 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #4936 from arashikou/3.5.x | Feng Xiao | 2018-07-19 | 1 | -1/+1 |
|\ | | | | | Do Not Define GOOGLE_FALLTHROUGH_INTENDED on GCC Without Attribute Support | ||||
| * | Do Not Define GOOGLE_FALLTHROUGH_INTENDED on GCC Without Attribute Support | John W. Bruce | 2018-07-18 | 1 | -1/+1 |
|/ | | | | | | | | | | The definition of GOOGLE_FALLTHROUGH_INTENDED assumed that [[gnu::fallthrough]] was always available on GCC 7+. While gnu::fallthrough is supported on GCC 7+, C++ attributes themselves are not supported on GCC if the C++ standard is before C++11. As a fix, the guard on this definition has been expanded to include a check for C++ attribute support. The form of this check is the one recommended by GCC at https://gcc.gnu.org/projects/cxx-status.html . | ||||
* | Guards for older GCC versions (#4870) | Tom Kent | 2018-07-06 | 13 | -26/+26 |
| | | | Guards for older GCC versions. | ||||
* | Merge pull request #4572 from jozefizso/fix/4494_compilation_error_c4146 | Feng Xiao | 2018-04-27 | 1 | -2/+2 |
|\ | | | | | Using binary one's complement to negate an unsigned int | ||||
| * | Using binary one's complement to negate an unsigned int | Jozef Izso | 2018-04-27 | 1 | -2/+2 |
|/ | | | | | | This removes a Visual Studio warning C4146: unary minus operator applied to unsigned type, result still unsigned. Original code: https://github.com/google/protobuf/commit/24493eef9395e5b832360e12efabf9c363c9cb15 | ||||
* | Merge pull request #4398 from pherl/catlog3.5 | Jisi Liu | 2018-03-19 | 1 | -1/+1 |
|\ | | | | | Cat the test-suite.log on errors for presubmits | ||||
| * | Cat the test-suite.log on errors for presubits | Jisi Liu | 2018-03-19 | 1 | -1/+1 |
|/ | |||||
* | Bump version number to 3.5.2v3.5.2 | Bo Yang | 2018-03-05 | 13 | -15/+31 |
| | |||||
* | Fix setup.py for windows build. | Bo Yang | 2018-03-05 | 1 | -4/+22 |
| | |||||
* | Merge pull request #4236 from pherl/3.5.x | Jisi Liu | 2018-01-26 | 1 | -1/+1 |
|\ | | | | | Bumping number to fix ruby 2.1 on mac | ||||
| * | Bumping number to fix ruby 2.1 on mac | Jisi Liu | 2018-01-26 | 1 | -1/+1 |
| | | |||||
* | | Fix more memory leak for php c extension (#4211) | Paul Yang | 2018-01-25 | 7 | -27/+117 |
|/ | | | | | | * Fix more memory leak for php c extension * Fix memory leak for php5.5 | ||||
* | Merge pull request #4185 from pherl/ruby2.5 | Jisi Liu | 2018-01-17 | 1 | -2/+2 |
|\ | | | | | Update rake file to build of 2.1.6. | ||||
| * | Update rake file to build of 2.1.6. | Jisi Liu | 2018-01-17 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #4182 from pherl/ruby2.5 | Jisi Liu | 2018-01-17 | 2 | -3/+3 |
|\| | | | | | Support ruby2.5 | ||||
| * | Support ruby2.5 | Jisi Liu | 2018-01-17 | 2 | -3/+3 |
| | | |||||
* | | Well known types are not initialized properly. (#4139) | Paul Yang | 2018-01-05 | 3 | -30/+68 |
| | | | | | | | | | | | | | | | | | | Previously, within the same load period of protobuf module, well known types are not initialized correctly for the second request. The reason is that well known type are only initialized if a method local static variable is not set. However, that variable is not reset after request ends. Therefore, when the second request comes, the method local static variable is still set (by previous request) and well types are not initialized in this case. | ||||
* | | Merge pull request #4146 from pherl/fix_protoc | Jisi Liu | 2018-01-05 | 1 | -1/+1 |
|\ \ | | | | | | | Bump protoc-artifact version for a patch rebuild | ||||
| * | | Bump protoc-artifact version for a patch rebuild | Jisi Liu | 2018-01-05 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #4124 from pherl/nullptr | Jisi Liu | 2018-01-03 | 1 | -1/+1 |
|\ \ | | | | | | | remove nullptr | ||||
| * | | remove nullptr | Jisi Liu | 2018-01-02 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #4090 from pherl/nopassword | Jisi Liu | 2018-01-03 | 1 | -6/+3 |
|\ \ \ | |/ / |/| | | Fix uploading binary wheel. | ||||
| * | | Fix uploading binary wheel. | Jisi Liu | 2017-12-22 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | The script now takes two prompt for user name and password. One single input redirection no longer works. | ||||
* | | | Merge pull request #4089 from pherl/nocache | Jisi Liu | 2017-12-22 | 1 | -1/+2 |
|\| | | |/ |/| | Disable pip cache when testing uploaded packages | ||||
| * | Disable pip cache when testing uploaded packages | Jisi Liu | 2017-12-22 | 1 | -1/+2 |
|/ | | | | | | | Otherwise, pip complains "cannot find a version satisfies the requirement." I suspect it was due to caching issues. I usued to manually add a `sleep 30` between the upload and the installation test which is quite unstable. | ||||
* | Merge pull request #4073 from pherl/changelogv3.5.1 | Jisi Liu | 2017-12-20 | 1 | -0/+31 |
|\ | | | | | Update changelog for 3.5.1 | ||||
| * | Update changelog | Jisi Liu | 2017-12-20 | 1 | -1/+1 |
| | | |||||
| * | Update changelog | Jisi Liu | 2017-12-19 | 1 | -2/+7 |
| | | |||||
| * | Merge branch '3.5.x' of github.com:google/protobuf into changelog | Jisi Liu | 2017-12-19 | 26 | -28/+28 |
| |\ | |||||
| * | | Update changelog for 3.5.1 | Jisi Liu | 2017-12-19 | 1 | -0/+26 |
| | | | |||||
* | | | Merge pull request #4080 from pherl/arm64 | Jisi Liu | 2017-12-20 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Add support for Windows ARM64 build | ||||
| * | | | Add support for Windows ARM64 build | Miradham Kamilov | 2017-12-20 | 1 | -0/+3 |
| | |/ | |/| | |||||
* | | | Merge pull request #4072 from google/jieluo | Jisi Liu | 2017-12-19 | 55 | -769/+4529 |
|\ \ \ | | | | | | | | | Cherrypick for csharp, including: | ||||
| * | | | Cherrypick for csharp, including: | Jie Luo | 2017-12-19 | 55 | -769/+4529 |
| | |/ | |/| | | | | | | | | | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files | ||||
* | | | Merge pull request #4076 from pherl/stringback | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Fix string::back() usage in googletest.cc | ||||
| * | | Fix string::back() usage in googletest.cc | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #4074 from pherl/mapat | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
|\ \ | | | | | | | Replace C++11 only method std::map::at | ||||
| * | | Replace C++11 only method std::map::at | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #4070 from pherl/3.5.x | Jisi Liu | 2017-12-19 | 25 | -27/+27 |
|\ \ | |/ |/| | Update version number to 3.5.1 | ||||
| * | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 25 | -27/+27 |
|/ | |||||
* | Fix file permission for python package. | Feng Xiao | 2017-12-15 | 1 | -0/+1 |
| | | | | `umask 0022` makes sure the created package will be accessible by all users. | ||||
* | Merge pull request #4034 from TeBoring/php-timestamp-bug | Paul Yang | 2017-12-15 | 4 | -16/+84 |
|\ | | | | | Avoid calling method from php extension directly | ||||
| * | Fix for php5.5 | Bo Yang | 2017-12-14 | 1 | -1/+1 |
| | | |||||
| * | Accept DatetimeInterface in fromDatetime | Bo Yang | 2017-12-14 | 2 | -12/+14 |
| | | |||||
| * | Avoid using php_date_get_date_ce() in case date extension is not | Bo Yang | 2017-12-13 | 1 | -2/+15 |
| | | | | | | | | available. | ||||
| * | Call php method via function name instead of calling directly. | Bo Yang | 2017-12-12 | 4 | -34/+50 |
| | | | | | | | | | | | | | | This changes the linking error if php extension is not statically linked to a runtime error. In this way, users who don't need Timestamp can still use protobuf even if date extension is not statically linked in php. | ||||
| * | Replace private timelib_update_ts with public date_timestamp_get | Bo Yang | 2017-12-12 | 2 | -5/+31 |
| | | |||||
| * | Add PROTOBUF_ENABLE_TIMESTAMP to let user decide whether timestamp util | Bo Yang | 2017-12-12 | 2 | -2/+13 |
| | | | | | | | | can be used at install time. |