aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge pull request #3690 from pherl/3.4.xJisi Liu2017-10-021-2/+2
| |\ \ \ \
| | * | | | Remove ranged based for in io_win32.ccJisi Liu2017-09-271-2/+2
| * | | | | Add spacesJisi Liu2017-09-271-1/+1
| * | | | | Fix C++11 string accessorsJisi Liu2017-09-271-1/+1
| |/ / / /
| * | | | Rename ClassNamePrefix to ConstantNamePrefixBo Yang2017-09-131-4/+3
| * | | | Exclude valid constant name from reserved name.Bo Yang2017-09-121-2/+35
| * | | | Add prefix to php reserved keywords.Bo Yang2017-09-081-3/+21
| |/ / /
| * / / change the field number of php_generic_service to fix the conflict with (#3576)Paul Yang2017-08-303-137/+137
| |/ /
* | | Use constexpr more with VC++ 2017 (#3707)Bruce Dawson2017-10-021-1/+2
* | | Test Shutdown can be called multiple times.Jisi Liu2017-09-211-0/+2
* | | Integrated internal changes from GoogleAdam Cozzette2017-09-14117-12977/+11214
* | | Clang warning cleanup for unused parameter.drivehappy2017-09-131-1/+1
* | | Exclude addressbook.proto from C# boostrap test.Feng Xiao2017-09-111-5/+0
* | | Merge pull request #3503 from gburgessiv/masterJisi Liu2017-08-241-1/+4
|\ \ \
| * | | Work around a bug in clang's static analyzerGeorge Burgess IV2017-08-221-1/+4
* | | | Merge pull request #3548 from google/3.4.xJisi Liu2017-08-223-54/+17
|\ \ \ \ | | |/ / | |/| |
| * | | Disable death tests on windowsJisi Liu2017-08-222-39/+2
| * | | 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_cleanupJisi Liu2017-08-212-29/+33
| * | | | Merge pull request #3494 from drivehappy/clang_warning_macroJisi Liu2017-08-211-2/+5
| |/ / /
| * | | Fix compile errorsJisi Liu2017-08-211-3/+3
| * | | Remove C++11 features in io_win32.ccJisi Liu2017-08-211-15/+15
* | | | Merge pull request #3535 from drivehappy/clang_warn_cleanupJisi Liu2017-08-212-29/+33
|\ \ \ \
| * | | | Fixing unused parameter warnings under Clang.drivehappy2017-08-212-29/+33
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-18178-7242/+12246
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix cmath/math.h include with non C++11 libstdc++Jisi Liu2017-08-151-6/+11
| * | Merge pull request #3485 from pherl/mingwv3.4.0rc3Jisi Liu2017-08-1113-15/+44
| |\ \
| | * | 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
| | * | 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
| | * | Fix the declaration order in ming32Jisi Liu2017-08-111-5/+5
| | * | Fixing io_win32 for MinGW32Jisi Liu2017-08-111-0/+3
| * | | Make compilers without ref-qualifier support happy.Jisi Liu2017-08-111-2/+4
| |/ /
| * | Make code free of missing-field-initializers warningsv3.4.0rc2Jisi Liu2017-08-0915-60/+62
| * | Merge branch 'master' into 3.4.xBo Yang2017-08-052-0/+2
| |\ \
| * | | Fix invalid offsetof warning.Jisi Liu2017-08-0314-143/+314
| * | | Add destructors for default instances to the shutdown code.Gerben Stavenga2017-08-0216-73/+152
| * | | Adding the missing headerJisi Liu2017-08-011-0/+1
| * | | Export functions in io_win32.h in win DLL buildJisi Liu2017-08-011-13/+14
| * | | Merge remote-tracking branch 'origin/master' into mergeJisi Liu2017-07-252-2/+3
| |\ \ \
| * | | | Merge from masterJisi Liu2017-07-2532-88/+1274
| * | | | Merge remote-tracking branch 'origin/3.4.x' into vbJisi Liu2017-07-241-22/+32
| |\ \ \ \
| | * | | | Omit the zip test if tools are not availableJisi Liu2017-07-241-22/+32
| * | | | | Update required version on pre-generated filesJisi Liu2017-07-2412-12/+12
| * | | | | Update pre generated filesJisi Liu2017-07-2412-12/+12
| * | | | | Update version number for 3.4.0Jisi Liu2017-07-241-5/+5
| |/ / / /
| * | | | remove profileJisi Liu2017-07-193-2238/+0