aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-18310-8291/+21043
|\
| * 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.
| | * Adding missing imports for strdupJisi Liu2017-08-111-0/+1
| | |
| | * Fix mkdirJisi Liu2017-08-111-2/+6
| | |
| | * Make win32_io only for MSVCJisi Liu2017-08-1112-12/+22
| | | | | | | | | | | | | | | This excludes cygwin and mingw from using the self implemented functions.
| | * Fix the declaration order in ming32Jisi Liu2017-08-111-5/+5
| | |
| | * Fixing io_win32 for MinGW32Jisi Liu2017-08-111-0/+3
| | |
| * | Merge pull request #3484 from pherl/qualifierJisi Liu2017-08-111-2/+4
| |\ \ | | |/ | |/| Make compilers without ref-qualifier support happy.
| | * Make compilers without ref-qualifier support happy.Jisi Liu2017-08-111-2/+4
| |/
| * Merge pull request #3481 from pherl/nowarningJisi Liu2017-08-101-12/+7
| |\ | | | | | | Make no warning test stricter.
| | * Make no warning test stricter.Jisi Liu2017-08-101-12/+7
| | | | | | | | | | | | | | | - Now it includes -Wextra except for unused-parameter. - Removed gtest dependency
| * | Merge pull request #3478 from pherl/warningJisi Liu2017-08-1016-61/+64
| |\| | | | | | | Make code free of missing-field-initializers warnings
| | * Make code free of missing-field-initializers warningsv3.4.0rc2Jisi Liu2017-08-0916-61/+64
| |/
| * Merge pull request #3461 from TeBoring/3.4.xv3.4.0rc1Jisi Liu2017-08-0746-126/+1627
| |\ | | | | | | Merge master into 3.4.x
| | * Merge branch 'master' into 3.4.xBo Yang2017-08-0546-126/+1627
| | |\
| * | \ Merge pull request #3468 from vladmos/3.4.xFeng Xiao2017-08-071-3/+3
| |\ \ \ | | |/ / | |/| | Make .bzl files compatible with future versions of Bazel
| | * | Make .bzl files compatible with future versions of BazelVladimir Moskva2017-08-071-3/+3
| |/ /
| * | Merge pull request #3450 from pherl/invalidoffsetJisi Liu2017-08-0315-144/+315
| |\ \ | | | | | | | | Fix invalid offsetof warning.
| | * | Fix invalid offsetof warning.Jisi Liu2017-08-0315-144/+315
| | | | | | | | | | | | | | | | Use composition instead of inheritance for oneof default.
| * | | Merge pull request #3451 from pherl/fixtypoJisi Liu2017-08-031-1/+1
| |\ \ \ | | |/ / | |/| | Fix typo.
| | * | Fix typo.Jisi Liu2017-08-031-1/+1
| |/ /
| * | Add destructors for default instances to the shutdown code.Gerben Stavenga2017-08-0216-73/+152
| | | | | | | | | | | | Verified test succeed under draconian heap checker
| * | Merge pull request #3442 from pherl/csharpversionJisi Liu2017-08-021-1/+1
| |\ \ | | | | | | | | Bump csharp version