Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge branch 'master' into down-integrate | Adam Cozzette | 2018-03-13 | 9 | -12/+77 | |
| |\ \ \ \ | ||||||
| * | | | | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 | 213 | -12611/+13193 | |
* | | | | | | Merge pull request #4371 from Rasrack/gnuc_minor | Adam Cozzette | 2018-03-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix spelling error of __GNUC_MINOR__ | Adam Aili | 2018-03-10 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #4310 from KindDragon/patch-1 | Feng Xiao | 2018-03-14 | 1 | -6/+9 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Support using MSVC intrinsics in Log2FloorNonZero | Arkady Shapkin | 2018-02-15 | 1 | -6/+9 | |
| |/ / / / | ||||||
* | / / / | Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources." | Feng Xiao | 2018-03-01 | 1 | -1/+1 | |
| |/ / / |/| | | | ||||||
* | | | | Merge pull request #4183 from pcc/win-libcxx | Feng Xiao | 2018-02-26 | 2 | -2/+3 | |
|\ \ \ \ | ||||||
| * | | | | Add support for libc++ on Windows. | Peter Collingbourne | 2018-01-17 | 2 | -2/+3 | |
* | | | | | Merge pull request #4334 from jmillikin/blacklist-internal-proto-srcs | Feng Xiao | 2018-02-26 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources. | John Millikin | 2018-02-24 | 1 | -1/+1 | |
* | | | | | | Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJson | Feng Xiao | 2018-02-26 | 5 | -6/+72 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | The JsonParseOptions::ignore_unknown_fields option behavior treats | Alexey Malov | 2018-02-12 | 5 | -6/+72 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #4323 from dtapuska/master | Feng Xiao | 2018-02-20 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Rename a shadowed variable. | Dave Tapuska | 2018-02-20 | 1 | -2/+2 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #3186 from gkelly/remove-unused-variable | Feng Xiao | 2018-02-20 | 1 | -2/+0 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Remove unused output_file variable from js_embed | Garret Kelly | 2017-06-05 | 1 | -2/+0 | |
* | | | | | Remove stray indent on normal imports. | Thomas Van Lenten | 2018-02-08 | 1 | -2/+2 | |
* | | | | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf. | Nico Weber | 2018-02-07 | 2 | -16/+1 | |
* | | | | | Merge pull request #4239 from mrpi/master | Adam Cozzette | 2018-01-31 | 1 | -4/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix -fpermissive: '<::' cannot begin a template-argument list | Ludger Sprenker | 2018-01-30 | 1 | -1/+1 | |
| * | | | | | Create std::string in Arena memory | Ludger Sprenker | 2018-01-24 | 1 | -4/+2 | |
* | | | | | | Fix to use "nil" instead of "NULL" for objc objects. | Thomas Van Lenten | 2018-01-31 | 1 | -1/+1 | |
* | | | | | | Add Vcpkg to C++ installation instructions for Windows | Robert Schumacher | 2018-01-29 | 1 | -0/+10 | |
* | | | | | | Merge pull request #4240 from davido/generate_warning_free_java_code | Feng Xiao | 2018-01-29 | 2 | -0/+30 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Java: Generate warning free code | David Ostrovsky | 2018-01-27 | 2 | -0/+30 | |
* | | | | | | | Removed using statements from common.h | Adam Cozzette | 2018-01-26 | 36 | -148/+143 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3934 from xfxyjwf/builtsources | Feng Xiao | 2018-01-25 | 1 | -4/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Remove the use of BUILT_SOURCES | Feng Xiao | 2018-01-24 | 1 | -4/+4 | |
| |/ / / / / | ||||||
* / / / / / | Add an explicit import of stdatomic.h. | Thomas Van Lenten | 2018-01-25 | 1 | -0/+35 | |
|/ / / / / | ||||||
* | / / / | Migrate away from deprecated OSAtomic APIs. (#4184) | Jonathan Dierksen | 2018-01-22 | 1 | -2/+3 | |
| |/ / / |/| | | | ||||||
* | | | | Merge pull request #4148 from datacompboy/patch-2 | Adam Cozzette | 2018-01-08 | 1 | -0/+53 | |
|\ \ \ \ | ||||||
| * | | | | Update time_test.cc | Anton Fedorov | 2018-01-05 | 1 | -0/+53 | |
* | | | | | Fix ValidateDateTime: check day instead month | Anton Fedorov | 2018-01-05 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | remove nullptr | Jisi Liu | 2018-01-02 | 1 | -1/+1 | |
* | | | | | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 21 | -156/+305 | |
|\| | | | | ||||||
| * | | | | Merge pull request #4080 from pherl/arm64 | Jisi Liu | 2017-12-20 | 1 | -0/+3 | |
| |\ \ \ \ | ||||||
| | * | | | | Add support for Windows ARM64 build | Miradham Kamilov | 2017-12-20 | 1 | -0/+3 | |
| * | | | | | Merge pull request #4072 from google/jieluo | Jisi Liu | 2017-12-19 | 4 | -51/+99 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Cherrypick for csharp, including: | Jie Luo | 2017-12-19 | 4 | -51/+99 | |
| * | | | | | | Fix string::back() usage in googletest.cc | Jisi Liu | 2017-12-19 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge pull request #4074 from pherl/mapat | Jisi Liu | 2017-12-19 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Replace C++11 only method std::map::at | Jisi Liu | 2017-12-19 | 1 | -1/+1 | |
| | |/ / / / | ||||||
| * / / / / | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 14 | -16/+16 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #4040 from bazurbat/3.5.x | Adam Cozzette | 2017-12-15 | 1 | -0/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | Create containing directory before generating well_known_types_embed.cc | Oleg Kolosov | 2017-12-13 | 1 | -0/+1 | |
| * | | | | | Merge pull request #4042 from pherl/cpp_enum | Jisi Liu | 2017-12-13 | 1 | -9/+9 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Use matching enum type for IsPOD. | Jisi Liu | 2017-12-13 | 1 | -9/+9 | |
| * | | | | | | Explicitly propagate the status of Flush(). | Jisi Liu | 2017-12-13 | 1 | -2/+2 | |
| | |/ / / / | |/| | | | |