Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change array to map for reserved names in c extension | Bo Yang | 2017-09-11 | 3 | -24/+69 |
| | |||||
* | Change array to associate array. | Bo Yang | 2017-09-11 | 1 | -20/+21 |
| | |||||
* | Add prefix to php reserved keywords. | Bo Yang | 2017-09-08 | 10 | -17/+615 |
| | |||||
* | Merge pull request #3596 from jtattermusch/csharp_target_net45 | Jan Tattermusch | 2017-09-07 | 1 | -1/+1 |
|\ | | | | | Google.Protobuf should target net45 (and not net451) | ||||
| * | Google.Protobuf should target net45 | Jan Tattermusch | 2017-09-05 | 1 | -1/+1 |
|/ | |||||
* | change the field number of php_generic_service to fix the conflict with (#3576) | Paul Yang | 2017-08-30 | 8 | -151/+216 |
| | | | internal descriptor.proto | ||||
* | Merge pull request #3565 from pherl/fixdist | Jisi Liu | 2017-08-24 | 2 | -1/+2 |
|\ | | | | | Add mising cmake files in dist | ||||
| * | Add mising cmake files in dist | Jisi Liu | 2017-08-24 | 2 | -1/+2 |
|/ | |||||
* | Merge pull request #3556 from matt-kwong/kokoro_mac_v3 | Jisi Liu | 2017-08-23 | 1 | -1/+3 |
|\ | | | | | Remove pre-installed softwares | ||||
| * | Remove pre-installed softwares | Matt Kwong | 2017-08-23 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #3555 from pherl/fixdist | Jisi Liu | 2017-08-23 | 2 | -3/+9 |
|\ | | | | | Make distcheck aware of test proto files. | ||||
| * | Make distcheck aware of test proto files. | Jisi Liu | 2017-08-23 | 2 | -3/+9 |
|/ | |||||
* | Merge pull request #3546 from pherl/deathtest | Jisi Liu | 2017-08-22 | 2 | -39/+2 |
|\ | | | | | Disable death tests on windows | ||||
| * | Disable death tests on windows | Jisi Liu | 2017-08-22 | 2 | -39/+2 |
|/ | | | | Also remove cord related code | ||||
* | Merge pull request #3537 from TeBoring/php-bug | Jisi Liu | 2017-08-22 | 5 | -1/+25 |
|\ | | | | | Use message name as defined in php runtime. | ||||
| * | Use message name as defined in php runtime. | Bo Yang | 2017-08-21 | 5 | -1/+25 |
| | | |||||
* | | Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1 | Jisi Liu | 2017-08-22 | 2 | -29/+33 |
|\ \ | | | | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | ||||
| * | | Merge pull request #3535 from drivehappy/clang_warn_cleanup | Jisi Liu | 2017-08-21 | 2 | -29/+33 |
| | | | | | | | | | Fixing unused parameter warnings under Clang. | ||||
* | | | Merge pull request #3540 from drivehappy/3.4.x_clang_cleanup_2 | Jisi Liu | 2017-08-22 | 1 | -2/+5 |
|\ \ \ | |/ / |/| | | Merge pull request #3494 from drivehappy/clang_warning_macro | ||||
| * | | Merge pull request #3494 from drivehappy/clang_warning_macro | Jisi Liu | 2017-08-21 | 1 | -2/+5 |
|/ / | | | | | Fixing -Wexpansion-to-defined Clang warning | ||||
* | | Merge pull request #3536 from pherl/io32_11 | Jisi Liu | 2017-08-21 | 1 | -15/+15 |
|\ \ | |/ |/| | Remove C++11 features in io_win32.cc | ||||
| * | Fix compile errors | Jisi Liu | 2017-08-21 | 1 | -3/+3 |
| | | |||||
| * | Remove C++11 features in io_win32.cc | Jisi Liu | 2017-08-21 | 1 | -15/+15 |
|/ | | | | | - Use scoped_array instead of unique_ptr. - Do not use string::front() and string::back() | ||||
* | Merge pull request #3528 from pherl/rubyfix | Jisi Liu | 2017-08-18 | 1 | -1/+1 |
|\ | | | | | Bump gemspec again | ||||
| * | Bump gemspec again | Jisi Liu | 2017-08-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3504 from pherl/3.4.x | Jisi Liu | 2017-08-18 | 1 | -0/+3 |
|\ \ | |/ |/| | Prefer system distributed binaries/libraries. | ||||
| * | Prefer system distributed binaries/libraries. | Jisi Liu | 2017-08-16 | 1 | -0/+3 |
| | | | | | | | | | | | | It seems like the image has a /usr/local/bin/autoconf installed, which doesn't recognize/work with the yum installed libtools. Putting distributed binaries/libraries first solves the problem | ||||
* | | Merge pull request #3514 from pherl/rubyfix | Jisi Liu | 2017-08-17 | 1 | -1/+1 |
|\ \ | | | | | | | Bump gem version for the next upload | ||||
| * | | Bump gem version for the next upload | Jisi Liu | 2017-08-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3502 from pherl/pypi | Jisi Liu | 2017-08-17 | 1 | -6/+6 |
|\ \ \ | | | | | | | | | Update testpypi URLs | ||||
| * | | | clean up | Jisi Liu | 2017-08-16 | 1 | -3/+0 |
| | | | | |||||
| * | | | Update testpypi addresses. | Jisi Liu | 2017-08-16 | 1 | -6/+9 |
| |/ / | | | | | | | | | | The old one is deprecated and no longer working. | ||||
* | | | Update CHANGES.txt | Jie Luo | 2017-08-16 | 1 | -1/+3 |
| | | | |||||
* | | | Update CHANGES.txt | Jie Luo | 2017-08-16 | 1 | -1/+2 |
| |/ |/| | |||||
* | | Update php version number to 3.4.0 | Bo Yang | 2017-08-16 | 1 | -1/+1 |
| | | |||||
* | | Update php c extension version number. | Bo Yang | 2017-08-16 | 2 | -3/+19 |
|/ | |||||
* | Merge pull request #3495 from pherl/c++11v3.4.0 | Jisi Liu | 2017-08-15 | 1 | -0/+19 |
|\ | | | | | Add std::forward and std::move autoconf check | ||||
| * | Add std::forward and std::move autoconf check | Jisi Liu | 2017-08-15 | 1 | -0/+19 |
| | | | | | | | | | | Protobuf now uses these two features, which are not available on some platforms. | ||||
* | | Merge pull request #3496 from pherl/mingw64 | Jisi Liu | 2017-08-15 | 2 | -4/+11 |
|\ \ | | | | | | | Static link pthread for mingw64 protoc and enable cross compile | ||||
| * | | Update readme | Jisi Liu | 2017-08-15 | 1 | -0/+6 |
| | | | |||||
| * | | static link for 32 bit build as well. | Jisi Liu | 2017-08-15 | 1 | -1/+1 |
| | | | |||||
| * | | Update comments that cross compile is feasible now | Jisi Liu | 2017-08-15 | 1 | -2/+0 |
| | | | | | | | | | | | | Need to install mingw-w64 on linux to cross compile | ||||
| * | | First try static linking pthread | Jisi Liu | 2017-08-15 | 1 | -2/+5 |
| |/ | |||||
* | | Merge pull request #3493 from pherl/cmath | Jisi Liu | 2017-08-15 | 1 | -6/+11 |
|\ \ | | | | | | | Fix cmath/math.h include with non C++11 libstdc++ | ||||
| * | | Fix cmath/math.h include with non C++11 libstdc++ | Jisi Liu | 2017-08-15 | 1 | -6/+11 |
| |/ | |||||
* | | Merge pull request #3488 from pherl/changelog | Jisi Liu | 2017-08-14 | 1 | -2/+3 |
|\ \ | |/ |/| | Update changelog for 3.4.x | ||||
| * | Update changelog for 3.4.x | Jisi Liu | 2017-08-14 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #3485 from pherl/mingwv3.4.0rc3 | Jisi Liu | 2017-08-11 | 13 | -15/+44 |
|\ | | | | | Fix build on MinGW32 | ||||
| * | Fix comments | Jisi Liu | 2017-08-11 | 2 | -1/+2 |
| | | |||||
| * | Add malloc cast | Jisi Liu | 2017-08-11 | 1 | -2/+2 |
| | |