aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/map_field_inl.h
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-2/+2
* Down-integrate from google3.Feng Xiao2018-08-081-6/+11
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-4/+6
* Fix map_field_inl.h for gcc 4.1Matt Hauck2017-07-111-2/+2
* Enusre public header and generated code have no implicit converion.Bo Yang2017-06-231-1/+1
* Down-integrate from google3.Feng Xiao2017-03-291-219/+71
* Fix gcc 4.1 build (#1035) (#1913)Matt Hauck2017-03-011-17/+17
* Down integrate from Google internal.Jisi Liu2016-04-281-7/+13
* Down-integrate from google internal.Jisi Liu2015-10-051-1/+2
* Fix bugs on windowsBo Yang2015-08-251-1/+3
* Down-integrate from google3.Feng Xiao2015-08-221-27/+204
* Fix C2385: accessing parent classes' member without specifying is ambiguous.Bo Yang2015-05-241-4/+5
* down-integrate internal changesBo Yang2015-05-211-1/+1
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-137/+161
* Fix issue 99.Feng Xiao2014-11-251-0/+9
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-141-0/+269