aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/compiler/cpp/cpp_map_field.cc
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-33/+23
* Down-integrate from google3.Feng Xiao2018-08-081-154/+151
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-7/+5
* Merge from google internalJisi Liu2017-10-181-10/+5
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-39/+2
* Merge master into 3.4.xJisi Liu2017-07-181-15/+21
|\
| * Fix more implicit type conversions in public headers and generated code.Bo Yang2017-06-241-4/+5
| * Enusre public header and generated code have no implicit converion.Bo Yang2017-06-231-11/+16
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-4/+9
|/
* Down-integrate from google3.Feng Xiao2017-03-291-28/+51
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-1/+3
* Add a "u" suffix to tag numbers in generated codeAdam Cozzette2016-11-221-1/+1
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-13/+19
* Integrate internal changesBo Yang2016-10-101-1/+2
* Integrate from internal code base.Feng Xiao2016-07-131-87/+118
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-31/+26
* Down integrate from Google internal.Jisi Liu2016-04-281-32/+33
* Down-integrate from google internal.Jisi Liu2015-10-051-3/+3
* Down-integrate from internal code base.Feng Xiao2015-08-231-2/+61
* Down-integrate from google3.Feng Xiao2015-08-221-3/+6
* down-integrate internal changesBo Yang2015-05-211-3/+6
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-27/+117
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-141-0/+255