aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3Jisi Liu2017-10-181-1/+1
|\
| * Clang warning cleanup for unused parameter.drivehappy2017-09-141-1/+1
| * Revert "Fix js conformance tests. (#3604)" (#3633)Paul Yang2017-09-131-29/+5
| * Fix js conformance tests. (#3604)Paul Yang2017-09-121-5/+29
* | 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
* 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
* 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
|\
| * Add a objc_class_prefix to test_messages_proto3.proto.Thomas Van Lenten2017-07-261-0/+1
| * Merge pull request #3410 from adam-26/1745Adam Cozzette2017-07-251-0/+1
| |\
| | * Fix quotation marksAdam2017-07-241-1/+1
| | * Fix issue #1745 - javascript allow dot in filenameAdam2017-07-241-0/+1
* | | 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 pull request #3407 from bklarson/masterAdam Cozzette2017-07-2514-0/+28
| |\ \
| | * | Put AddDescriptorsImpl() in anonymous namespaceBrad Larson2017-07-2414-0/+28
| * | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChongYilun Chong2017-07-242-3/+219
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'master' into ConformanceTestYilunChongYilun Chong2017-06-3039-818/+967
| | |\ \
| | * | | add some test proto2 supported, add js proto2 supported, fixed some errorYilun Chong2017-06-302-4/+4
| | * | | change php objc nodejs csharp rubyYilun Chong2017-06-291-7/+7
| | * | | add message set test caseYilun Chong2017-06-281-0/+20
| | * | | add support for proto2Yilun Chong2017-06-261-4/+4
| | * | | add test_proto2_message.proto and change conformnace/makefile.amYilun Chong2017-06-231-0/+196
| * | | | Merge pull request #2969 from laszlocsomor/masterFeng Xiao2017-07-2413-81/+947
| |\ \ \ \ | | |_|_|/ | |/| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 20:44:40 +0000