aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/stubs
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-0421-516/+460
* Fix failing tests.Feng Xiao2018-08-091-0/+9
* Merge master branch.Feng Xiao2018-08-0824-153/+153
|\
| * 4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubsDhruv2018-08-0723-148/+148
| * Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-011-5/+5
| |\
| | * Updated version numbers to 3.6.1Adam Cozzette2018-07-271-5/+5
* | | Down-integrate from google3.Feng Xiao2018-08-087-332/+166
|/ /
* | OnShutdownDelete shadowing issueIvan Shynkarenka2018-07-101-1/+1
* | Merge pull request #4882 from google/3.6.xAdam Cozzette2018-07-092-49/+30
|\|
| * Fix initialization with Visual StudioAdam Cozzette2018-07-062-49/+30
* | Fix to allow a compilation under mips big endian with gccCharles Hardin2018-06-281-1/+1
* | Removed forward declaration of MemBlock classMichal Matuszak2018-06-251-1/+0
* | Merge pull request #4827 from acozzette/merge-3-6-xAdam Cozzette2018-06-251-5/+5
|\ \
| * | Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-06-251-5/+5
| |\|
| | * Update version number to 3.6.0Jisi Liu2018-05-141-5/+5
* | | Merge pull request #4824 from sschuberth/remove-exec-bitFeng Xiao2018-06-251-0/+0
|\ \ \
| * | | Remove the executable bit from several source code filesSebastian Schuberth2018-06-251-0/+0
| |/ /
* | | Merge pull request #4608 from khuzemap/masterFeng Xiao2018-06-252-23/+23
|\ \ \
| * | | Add "override" for overridden virtual functionsKhuzema Pithewan2018-06-192-23/+23
| | |/ | |/|
* | | Merge pull request #4172 from OskarKinomoto/masterAdam Cozzette2018-06-251-0/+8
|\ \ \ | |_|/ |/| |
| * | Add guards against bswap_XX redefnitionsOskar SĖwitalski2018-01-151-0/+8
* | | Merge pull request #1261 from gjasny/disable-tls-for-osx-10.6Adam Cozzette2018-06-201-0/+6
|\ \ \
| * | | Disable thread local storage for OSX < 10.7Gregor Jasny2016-02-191-0/+6
* | | | Added Clang thread-safety annotations in mutex.hAdam Cozzette2018-05-301-3/+17
* | | | re-write int128 long division to avoid license impact from stackoverflow refe...NickFengIBM2018-05-171-34/+18
| |_|/ |/| |
* | | MinGW build failedIvan Shynkarenka2018-05-021-1/+1
* | | Removed atomicops.h since it is no longer usedAdam Cozzette2018-03-271-237/+0
* | | Removed some unused C++ source filesAdam Cozzette2018-03-2220-4897/+0
* | | Merge pull request #4387 from acozzette/down-integrateAdam Cozzette2018-03-2014-422/+80
|\ \ \
| * | | Deleted scoped_ptr.hAdam Cozzette2018-03-145-255/+8
| * | | Merge branch 'master' into down-integrateAdam Cozzette2018-03-131-1/+2
| |\ \ \
| * | | | Integrated internal changes from GoogleAdam Cozzette2018-03-1310-179/+84
* | | | | Merge pull request #4371 from Rasrack/gnuc_minorAdam Cozzette2018-03-151-1/+1
|\ \ \ \ \
| * | | | | Fix spelling error of __GNUC_MINOR__Adam Aili2018-03-101-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #4310 from KindDragon/patch-1Feng Xiao2018-03-141-6/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Support using MSVC intrinsics in Log2FloorNonZeroArkady Shapkin2018-02-151-6/+9
| |/ / /
* | | | Merge pull request #4183 from pcc/win-libcxxFeng Xiao2018-02-261-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add support for libc++ on Windows.Peter Collingbourne2018-01-171-1/+2
| | |/ | |/|
* | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.Nico Weber2018-02-071-14/+0
* | | Removed using statements from common.hAdam Cozzette2018-01-2613-38/+33
|/ /
* | Merge pull request #4148 from datacompboy/patch-2Adam Cozzette2018-01-081-0/+53
|\ \
| * | Update time_test.ccAnton Fedorov2018-01-051-0/+53
* | | Fix ValidateDateTime: check day instead monthAnton Fedorov2018-01-051-2/+2
|/ /
* | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-1/+1
|\ \
| * | remove nullptrJisi Liu2018-01-021-1/+1
* | | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-034-128/+276
|\| |
| * | Add support for Windows ARM64 buildMiradham Kamilov2017-12-201-0/+3
| * | Update version number to 3.5.1Jisi Liu2017-12-191-1/+1
| * | io_win32_unittest: remove incorrect error checkLaszlo Csomor2017-12-071-3/+3
| * | io_win32_unittest: fix condition in GetCwdAsUtf8Laszlo Csomor2017-12-071-1/+1