Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Down-integrate from google3. | Josh Haberman | 2018-09-04 | 21 | -516/+460 |
* | Fix failing tests. | Feng Xiao | 2018-08-09 | 1 | -0/+9 |
* | Merge master branch. | Feng Xiao | 2018-08-08 | 24 | -153/+153 |
|\ | |||||
| * | 4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubs | Dhruv | 2018-08-07 | 23 | -148/+148 |
| * | Merge branch '3.6.x' into merge-3-6-x | Adam Cozzette | 2018-08-01 | 1 | -5/+5 |
| |\ | |||||
| | * | Updated version numbers to 3.6.1 | Adam Cozzette | 2018-07-27 | 1 | -5/+5 |
* | | | Down-integrate from google3. | Feng Xiao | 2018-08-08 | 7 | -332/+166 |
|/ / | |||||
* | | OnShutdownDelete shadowing issue | Ivan Shynkarenka | 2018-07-10 | 1 | -1/+1 |
* | | Merge pull request #4882 from google/3.6.x | Adam Cozzette | 2018-07-09 | 2 | -49/+30 |
|\| | |||||
| * | Fix initialization with Visual Studio | Adam Cozzette | 2018-07-06 | 2 | -49/+30 |
* | | Fix to allow a compilation under mips big endian with gcc | Charles Hardin | 2018-06-28 | 1 | -1/+1 |
* | | Removed forward declaration of MemBlock class | Michal Matuszak | 2018-06-25 | 1 | -1/+0 |
* | | Merge pull request #4827 from acozzette/merge-3-6-x | Adam Cozzette | 2018-06-25 | 1 | -5/+5 |
|\ \ | |||||
| * | | Merge branch '3.6.x' into merge-3-6-x | Adam Cozzette | 2018-06-25 | 1 | -5/+5 |
| |\| | |||||
| | * | Update version number to 3.6.0 | Jisi Liu | 2018-05-14 | 1 | -5/+5 |
* | | | Merge pull request #4824 from sschuberth/remove-exec-bit | Feng Xiao | 2018-06-25 | 1 | -0/+0 |
|\ \ \ | |||||
| * | | | Remove the executable bit from several source code files | Sebastian Schuberth | 2018-06-25 | 1 | -0/+0 |
| |/ / | |||||
* | | | Merge pull request #4608 from khuzemap/master | Feng Xiao | 2018-06-25 | 2 | -23/+23 |
|\ \ \ | |||||
| * | | | Add "override" for overridden virtual functions | Khuzema Pithewan | 2018-06-19 | 2 | -23/+23 |
| | |/ | |/| | |||||
* | | | Merge pull request #4172 from OskarKinomoto/master | Adam Cozzette | 2018-06-25 | 1 | -0/+8 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Add guards against bswap_XX redefnitions | Oskar SĖwitalski | 2018-01-15 | 1 | -0/+8 |
* | | | Merge pull request #1261 from gjasny/disable-tls-for-osx-10.6 | Adam Cozzette | 2018-06-20 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | Disable thread local storage for OSX < 10.7 | Gregor Jasny | 2016-02-19 | 1 | -0/+6 |
* | | | | Added Clang thread-safety annotations in mutex.h | Adam Cozzette | 2018-05-30 | 1 | -3/+17 |
* | | | | re-write int128 long division to avoid license impact from stackoverflow refe... | NickFengIBM | 2018-05-17 | 1 | -34/+18 |
| |_|/ |/| | | |||||
* | | | MinGW build failed | Ivan Shynkarenka | 2018-05-02 | 1 | -1/+1 |
* | | | Removed atomicops.h since it is no longer used | Adam Cozzette | 2018-03-27 | 1 | -237/+0 |
* | | | Removed some unused C++ source files | Adam Cozzette | 2018-03-22 | 20 | -4897/+0 |
* | | | Merge pull request #4387 from acozzette/down-integrate | Adam Cozzette | 2018-03-20 | 14 | -422/+80 |
|\ \ \ | |||||
| * | | | Deleted scoped_ptr.h | Adam Cozzette | 2018-03-14 | 5 | -255/+8 |
| * | | | Merge branch 'master' into down-integrate | Adam Cozzette | 2018-03-13 | 1 | -1/+2 |
| |\ \ \ | |||||
| * | | | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 | 10 | -179/+84 |
* | | | | | 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 |
| |/ / / | |||||
* | | | | Merge pull request #4183 from pcc/win-libcxx | Feng Xiao | 2018-02-26 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Add support for libc++ on Windows. | Peter Collingbourne | 2018-01-17 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf. | Nico Weber | 2018-02-07 | 1 | -14/+0 |
* | | | Removed using statements from common.h | Adam Cozzette | 2018-01-26 | 13 | -38/+33 |
|/ / | |||||
* | | 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 | 4 | -128/+276 |
|\| | | |||||
| * | | Add support for Windows ARM64 build | Miradham Kamilov | 2017-12-20 | 1 | -0/+3 |
| * | | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| * | | io_win32_unittest: remove incorrect error check | Laszlo Csomor | 2017-12-07 | 1 | -3/+3 |
| * | | io_win32_unittest: fix condition in GetCwdAsUtf8 | Laszlo Csomor | 2017-12-07 | 1 | -1/+1 |