aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/map_entry_lite.h
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-20/+57
* Down-integrate from google3.Feng Xiao2018-08-081-22/+35
* Add "override" for overridden virtual functionsKhuzema Pithewan2018-06-191-21/+14
* Merge branch 'master' into down-integrateAdam Cozzette2018-03-131-2/+2
|\
| * Rename a shadowed variable.Dave Tapuska2018-02-201-2/+2
* | Integrated internal changes from GoogleAdam Cozzette2018-03-131-3/+4
|/
* Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.Nico Weber2018-02-071-2/+1
* Integrated internal changes from GoogleAdam Cozzette2017-12-011-2/+7
* Merge from google internalJisi Liu2017-10-181-2/+2
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-37/+28
* Merge master into 3.4.xJisi Liu2017-07-181-5/+6
|\
| * Fix more implicit type conversions in public headers and generated code.Bo Yang2017-06-241-5/+6
| * Enusre public header and generated code have no implicit converion.Bo Yang2017-06-231-3/+3
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-0/+87
|/
* Fix MSVC DLL build.Feng Xiao2017-03-301-2/+2
* Down-integrate from google3.Feng Xiao2017-03-291-87/+104
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-3/+2
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-10/+13
* Integrate internal changesBo Yang2016-10-101-3/+3
* Integrate from internal code base.Feng Xiao2016-07-131-0/+26
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-3/+144
* Fix bugs on windowsBo Yang2015-08-251-2/+2
* Down-integrate from google3.Feng Xiao2015-08-221-86/+76
* Move the definition of GOOGLE_FALLTHROUGH_INTENDED to port.hteboring2015-07-291-12/+0
* Internal local modifications.Bo Yang2015-07-091-0/+12
* Fix bugs on windows.Bo Yang2015-05-241-6/+6
* down-integrate internal changesBo Yang2015-05-211-8/+10
* Initialize data members in constructors instead of direct initialize inJisi Liu2015-03-011-3/+3
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-0/+409