Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3535 from drivehappy/clang_warn_cleanup | Jisi Liu | 2017-08-21 | 2 | -29/+33 |
|\ | |||||
| * | Fixing unused parameter warnings under Clang. | drivehappy | 2017-08-21 | 2 | -29/+33 |
* | | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 178 | -7242/+12246 |
|\ \ | |/ |/| | |||||
| * | Fix cmath/math.h include with non C++11 libstdc++ | Jisi Liu | 2017-08-15 | 1 | -6/+11 |
| * | Merge pull request #3485 from pherl/mingwv3.4.0rc3 | Jisi Liu | 2017-08-11 | 13 | -15/+44 |
| |\ | |||||
| | * | Fix comments | Jisi Liu | 2017-08-11 | 2 | -1/+2 |
| | * | Add malloc cast | Jisi Liu | 2017-08-11 | 1 | -2/+2 |
| | * | implement remove strdup usage and implement our own | Jisi Liu | 2017-08-11 | 1 | -2/+12 |
| | * | Adding missing imports for strdup | Jisi Liu | 2017-08-11 | 1 | -0/+1 |
| | * | Fix mkdir | Jisi Liu | 2017-08-11 | 1 | -2/+6 |
| | * | Make win32_io only for MSVC | Jisi Liu | 2017-08-11 | 12 | -12/+22 |
| | * | Fix the declaration order in ming32 | Jisi Liu | 2017-08-11 | 1 | -5/+5 |
| | * | Fixing io_win32 for MinGW32 | Jisi Liu | 2017-08-11 | 1 | -0/+3 |
| * | | Make compilers without ref-qualifier support happy. | Jisi Liu | 2017-08-11 | 1 | -2/+4 |
| |/ | |||||
| * | Make code free of missing-field-initializers warningsv3.4.0rc2 | Jisi Liu | 2017-08-09 | 15 | -60/+62 |
| * | Merge branch 'master' into 3.4.x | Bo Yang | 2017-08-05 | 2 | -0/+2 |
| |\ | |||||
| * | | Fix invalid offsetof warning. | Jisi Liu | 2017-08-03 | 14 | -143/+314 |
| * | | Add destructors for default instances to the shutdown code. | Gerben Stavenga | 2017-08-02 | 16 | -73/+152 |
| * | | Adding the missing header | Jisi Liu | 2017-08-01 | 1 | -0/+1 |
| * | | Export functions in io_win32.h in win DLL build | Jisi Liu | 2017-08-01 | 1 | -13/+14 |
| * | | Merge remote-tracking branch 'origin/master' into merge | Jisi Liu | 2017-07-25 | 2 | -2/+3 |
| |\ \ | |||||
| * | | | Merge from master | Jisi Liu | 2017-07-25 | 32 | -88/+1274 |
| * | | | Merge remote-tracking branch 'origin/3.4.x' into vb | Jisi Liu | 2017-07-24 | 1 | -22/+32 |
| |\ \ \ | |||||
| | * | | | Omit the zip test if tools are not available | Jisi Liu | 2017-07-24 | 1 | -22/+32 |
| * | | | | Update required version on pre-generated files | Jisi Liu | 2017-07-24 | 12 | -12/+12 |
| * | | | | Update pre generated files | Jisi Liu | 2017-07-24 | 12 | -12/+12 |
| * | | | | Update version number for 3.4.0 | Jisi Liu | 2017-07-24 | 1 | -5/+5 |
| |/ / / | |||||
| * | | | remove profile | Jisi Liu | 2017-07-19 | 3 | -2238/+0 |
| * | | | Merge master into 3.4.x | Jisi Liu | 2017-07-18 | 84 | -1014/+1728 |
| |\ \ \ | |||||
| * | | | | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 168 | -4944/+11724 |
* | | | | | Fixing warning under Clang 6.x (-Wexpansion-to-defined) where the macro expan... | drivehappy | 2017-08-15 | 1 | -2/+5 |
* | | | | | Clean up typedefs for Atomic32/Atomic64 | Brad Larson | 2017-08-10 | 1 | -21/+14 |
| |_|_|/ |/| | | | |||||
* | | | | Add a objc_class_prefix to test_messages_proto3.proto. | Thomas Van Lenten | 2017-07-26 | 1 | -0/+1 |
* | | | | Merge pull request #3410 from adam-26/1745 | Adam Cozzette | 2017-07-25 | 1 | -0/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Fix quotation marks | Adam | 2017-07-24 | 1 | -1/+1 |
| * | | | Fix issue #1745 - javascript allow dot in filename | Adam | 2017-07-24 | 1 | -0/+1 |
* | | | | Merge pull request #3407 from bklarson/master | Adam Cozzette | 2017-07-25 | 14 | -0/+28 |
|\ \ \ \ | |||||
| * | | | | Put AddDescriptorsImpl() in anonymous namespace | Brad Larson | 2017-07-24 | 14 | -0/+28 |
* | | | | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChong | Yilun Chong | 2017-07-24 | 2 | -3/+219 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Merge branch 'master' into ConformanceTestYilunChong | Yilun Chong | 2017-06-30 | 39 | -818/+967 |
| |\ \ \ \ | |||||
| * | | | | | add some test proto2 supported, add js proto2 supported, fixed some error | Yilun Chong | 2017-06-30 | 2 | -4/+4 |
| * | | | | | change php objc nodejs csharp ruby | Yilun Chong | 2017-06-29 | 1 | -7/+7 |
| * | | | | | add message set test case | Yilun Chong | 2017-06-28 | 1 | -0/+20 |
| * | | | | | add support for proto2 | Yilun Chong | 2017-06-26 | 1 | -4/+4 |
| * | | | | | add test_proto2_message.proto and change conformnace/makefile.am | Yilun Chong | 2017-06-23 | 1 | -0/+196 |
* | | | | | | Merge pull request #2969 from laszlocsomor/master | Feng Xiao | 2017-07-24 | 13 | -81/+947 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Windows: support long paths | Laszlo Csomor | 2017-07-11 | 13 | -81/+947 |
* | | | | | | Fixed dynamic initialization for C++ lite | Adam Cozzette | 2017-07-19 | 15 | -75/+26 |
* | | | | | | Merge pull request #3375 from TeBoring/3.3.x | Paul Yang | 2017-07-19 | 33 | -20/+94 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Merge 3.3.x into master | Bo Yang | 2017-07-18 | 33 | -20/+94 |
| |\ \ \ \ \ |