aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/arena.cc
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-15/+15
* Down-integrate from google3.Feng Xiao2018-08-081-4/+4
* Remove the executable bit from several source code filesSebastian Schuberth2018-06-251-0/+0
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-26/+21
* Integrated internal changes from GoogleAdam Cozzette2017-12-011-168/+203
* Merge from google internalJisi Liu2017-10-181-127/+138
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-4/+21
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-96/+138
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-17/+6
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-4/+14
* Integrate internal changesBo Yang2016-10-101-4/+6
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-9/+2
* Down integrate from Google internal.Jisi Liu2016-04-281-0/+14
* Integrate google internal changes.Jisi Liu2016-03-301-0/+1
* Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-051-0/+3
|\
| * Merge pull request #727 from AustinSchuh/arena_bounds_fixFeng Xiao2015-09-241-0/+3
| |\
| | * Handled blocks being too small in arena.ccAustin Schuh2015-08-281-0/+3
* | | Down-integrate from google internal.Jisi Liu2015-10-051-6/+6
|/ /
* / Down-integrate from google3.Feng Xiao2015-08-221-17/+23
|/
* Refactored threadlocal logic.Austin Schuh2015-06-081-1/+1
* down-integrate internal changesBo Yang2015-05-211-2/+7
* internal changesBo Yang2015-04-241-0/+7
* Use portable GOOGLE_PROTOBUF_THREAD_LOCAL instead of __thread.Jisi Liu2015-03-011-1/+1
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-20/+47
* Fix LIBPROTOBUF_PROTOBUF annotations for buliding protobuf as DLLs.v3.0.0-alpha-1Feng Xiao2014-12-091-6/+13
* Fix compile issues and test failures in VS2008.Feng Xiao2014-12-051-1/+1
* Get rid of some build warnings.Feng Xiao2014-12-021-3/+3
* Down-integrate from internal code base.Feng Xiao2014-11-201-0/+13
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-141-1/+1
* Down-integrate from internal code base.Feng Xiao2014-11-101-0/+238