aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change array to associate array.Bo Yang2017-09-111-20/+21
|
* Add prefix to php reserved keywords.Bo Yang2017-09-0810-17/+615
|
* Merge pull request #3596 from jtattermusch/csharp_target_net45Jan Tattermusch2017-09-071-1/+1
|\ | | | | Google.Protobuf should target net45 (and not net451)
| * Google.Protobuf should target net45Jan Tattermusch2017-09-051-1/+1
|/
* change the field number of php_generic_service to fix the conflict with (#3576)Paul Yang2017-08-308-151/+216
| | | internal descriptor.proto
* Merge pull request #3565 from pherl/fixdistJisi Liu2017-08-242-1/+2
|\ | | | | Add mising cmake files in dist
| * Add mising cmake files in distJisi Liu2017-08-242-1/+2
|/
* Merge pull request #3556 from matt-kwong/kokoro_mac_v3Jisi Liu2017-08-231-1/+3
|\ | | | | Remove pre-installed softwares
| * Remove pre-installed softwaresMatt Kwong2017-08-231-1/+3
|/
* Merge pull request #3555 from pherl/fixdistJisi Liu2017-08-232-3/+9
|\ | | | | Make distcheck aware of test proto files.
| * Make distcheck aware of test proto files.Jisi Liu2017-08-232-3/+9
|/
* Merge pull request #3546 from pherl/deathtestJisi Liu2017-08-222-39/+2
|\ | | | | Disable death tests on windows
| * Disable death tests on windowsJisi Liu2017-08-222-39/+2
|/ | | | Also remove cord related code
* Merge pull request #3537 from TeBoring/php-bugJisi Liu2017-08-225-1/+25
|\ | | | | Use message name as defined in php runtime.
| * Use message name as defined in php runtime.Bo Yang2017-08-215-1/+25
| |
* | Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1Jisi Liu2017-08-222-29/+33
|\ \ | | | | | | Merge pull request #3535 from drivehappy/clang_warn_cleanup
| * | Merge pull request #3535 from drivehappy/clang_warn_cleanupJisi Liu2017-08-212-29/+33
| | | | | | | | | Fixing unused parameter warnings under Clang.
* | | Merge pull request #3540 from drivehappy/3.4.x_clang_cleanup_2Jisi Liu2017-08-221-2/+5
|\ \ \ | |/ / |/| | Merge pull request #3494 from drivehappy/clang_warning_macro
| * | Merge pull request #3494 from drivehappy/clang_warning_macroJisi Liu2017-08-211-2/+5
|/ / | | | | Fixing -Wexpansion-to-defined Clang warning
* | Merge pull request #3536 from pherl/io32_11Jisi Liu2017-08-211-15/+15
|\ \ | |/ |/| Remove C++11 features in io_win32.cc
| * Fix compile errorsJisi Liu2017-08-211-3/+3
| |
| * Remove C++11 features in io_win32.ccJisi Liu2017-08-211-15/+15
|/ | | | | - Use scoped_array instead of unique_ptr. - Do not use string::front() and string::back()
* Merge pull request #3528 from pherl/rubyfixJisi Liu2017-08-181-1/+1
|\ | | | | Bump gemspec again
| * Bump gemspec againJisi Liu2017-08-181-1/+1
| |
* | Merge pull request #3504 from pherl/3.4.xJisi Liu2017-08-181-0/+3
|\ \ | |/ |/| Prefer system distributed binaries/libraries.
| * Prefer system distributed binaries/libraries.Jisi Liu2017-08-161-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/rubyfixJisi Liu2017-08-171-1/+1
|\ \ | | | | | | Bump gem version for the next upload
| * | Bump gem version for the next uploadJisi Liu2017-08-171-1/+1
| | |
* | | Merge pull request #3502 from pherl/pypiJisi Liu2017-08-171-6/+6
|\ \ \ | | | | | | | | Update testpypi URLs
| * | | clean upJisi Liu2017-08-161-3/+0
| | | |
| * | | Update testpypi addresses.Jisi Liu2017-08-161-6/+9
| |/ / | | | | | | | | | The old one is deprecated and no longer working.
* | | Update CHANGES.txtJie Luo2017-08-161-1/+3
| | |
* | | Update CHANGES.txtJie Luo2017-08-161-1/+2
| |/ |/|
* | Update php version number to 3.4.0Bo Yang2017-08-161-1/+1
| |
* | Update php c extension version number.Bo Yang2017-08-162-3/+19
|/
* Merge pull request #3495 from pherl/c++11v3.4.0Jisi Liu2017-08-151-0/+19
|\ | | | | Add std::forward and std::move autoconf check
| * Add std::forward and std::move autoconf checkJisi Liu2017-08-151-0/+19
| | | | | | | | | | Protobuf now uses these two features, which are not available on some platforms.
* | Merge pull request #3496 from pherl/mingw64Jisi Liu2017-08-152-4/+11
|\ \ | | | | | | Static link pthread for mingw64 protoc and enable cross compile
| * | Update readmeJisi Liu2017-08-151-0/+6
| | |
| * | static link for 32 bit build as well.Jisi Liu2017-08-151-1/+1
| | |
| * | Update comments that cross compile is feasible nowJisi Liu2017-08-151-2/+0
| | | | | | | | | | | | Need to install mingw-w64 on linux to cross compile
| * | First try static linking pthreadJisi Liu2017-08-151-2/+5
| |/
* | Merge pull request #3493 from pherl/cmathJisi Liu2017-08-151-6/+11
|\ \ | | | | | | Fix cmath/math.h include with non C++11 libstdc++
| * | Fix cmath/math.h include with non C++11 libstdc++Jisi Liu2017-08-151-6/+11
| |/
* | Merge pull request #3488 from pherl/changelogJisi Liu2017-08-141-2/+3
|\ \ | |/ |/| Update changelog for 3.4.x
| * 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.