aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/map_type_handler.h
Commit message (Collapse)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2018-08-081-87/+88
|
* Merge pull request #3535 from drivehappy/clang_warn_cleanupJisi Liu2017-08-211-28/+31
|\ | | | | Fixing unused parameter warnings under Clang.
| * Fixing unused parameter warnings under Clang.drivehappy2017-08-211-28/+31
| |
* | Merge master into 3.4.xJisi Liu2017-07-181-3/+5
|\|
| * Fix more implicit type conversions in public headers and generated code.Bo Yang2017-06-241-1/+2
| |
| * Enusre public header and generated code have no implicit converion.Bo Yang2017-06-231-3/+4
| |
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-1/+0
|/
* Down-integrate from google3.Feng Xiao2017-03-291-37/+33
|
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-12/+8
|
* Integrate internal changesBo Yang2016-10-101-2/+2
|
* Integrate from internal code base.Feng Xiao2016-07-131-9/+9
|
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-13/+29
| | | | This includes all internal changes from around May 20 to now.
* Rename 'BYTE_SIZE' macro to 'GOOGLE_PROTOBUF_BYTE_SIZE'kbinani2015-09-041-12/+12
| | | | | | Xcode raises warning that says "'BYTE_SIZE' macro redefined". The original 'BYTE_SIZE' macro definition is here, for example: '/Applications/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/mach/vm_param.h'
* Down-integrate from google3.Feng Xiao2015-08-221-259/+470
|
* down-integrate internal changesBo Yang2015-05-211-2/+2
|
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-85/+115
| | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-141-0/+486