aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/map.h
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-5/+9
* Down-integrate from google3.Feng Xiao2018-08-081-9/+12
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-8/+1
* Integrated internal changes from GoogleAdam Cozzette2017-12-011-1/+10
* Merge from google internalJisi Liu2017-10-181-2/+22
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-3/+1
* Merge pull request #3535 from drivehappy/clang_warn_cleanupJisi Liu2017-08-211-1/+2
|\
| * Fixing unused parameter warnings under Clang.drivehappy2017-08-211-1/+2
* | Merge master into 3.4.xJisi Liu2017-07-181-14/+1
|\|
| * Use consistent hash across NDEBUG/!NDEBUG builds.Harvey Tuch2017-07-071-7/+0
| * Fix more implicit type conversions in public headers and generated code.Bo Yang2017-06-241-1/+1
| * not to use std::random_device for map.Seed(). (#3133)Wayne Zhang2017-05-301-13/+0
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-11/+14
|/
* Down-integrate from google3.Feng Xiao2017-03-291-630/+78
* Removes ignored const from return type (#2915)Juan David Dominguez2017-03-291-1/+1
* Fix gcc warning when using map (#2213)drivehappy2017-03-281-1/+3
* Fix gcc 4.1 build (#1035) (#1913)Matt Hauck2017-03-011-2/+9
* Change hint type to `const void*` (#2568)Matt Hauck2017-03-011-1/+1
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-2/+3
* Removed Android-specific code from stubs/hash.hAdam Cozzette2016-12-131-1/+0
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-5/+7
* Integrate internal changesBo Yang2016-10-101-4/+8
* Add and fix C++ runtime docsJisi Liu2016-08-021-3/+6
* Fix sign-comparison warnings in public header files.Feng Xiao2016-07-221-1/+1
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-1/+19
* Address review comments on function namevjpai2016-06-161-2/+2
* Remove a friend-class template that is only used for theVijay Pai2016-06-151-4/+7
* Remove the comments about iterator validationJisi Liu2016-05-131-3/+1
* Down integrate from Google internal.Jisi Liu2016-04-281-14/+27
* Remove export macros for classes nested in a template class.Jisi Liu2016-03-311-3/+3
* Fix breakage of referring to table_ in static funcJisi Liu2016-03-311-1/+1
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-301-3/+9
|\
| * Fixing compilation error when building with emscripten.Ben Vanik2016-03-111-1/+3
| * Comment has been added to fix (issue #1266)Antal Tátrai2016-03-081-0/+4
| * Fix compiling clang/libc++ builds. (Issue: #1266)Antal Tátrai2016-03-051-1/+1
* | Integrate google internal changes.Jisi Liu2016-03-301-131/+951
|/
* Down-integrate from internal code base.Feng Xiao2015-12-111-16/+10
* Adds support for buliding protobuf with emscripten; we just needed the proper...Craig Donner2015-11-241-1/+3
* Merge pull request #875 from tkarls/return_correct_bool_type_from_mapFeng Xiao2015-10-131-1/+1
|\
| * Changed return type from int32 to bool in function returning a boolThomas Karlsson2015-10-131-1/+1
* | Changed argument typ to uint32 in set function that sets an uint32 valueThomas Karlsson2015-10-131-1/+1
|/
* Down-integrate internal bug fixing changes.Bo Yang2015-10-041-0/+6
* Fix bugs on windowsBo Yang2015-08-251-1/+24
* Down-integrate from google3.Feng Xiao2015-08-221-9/+414
* Fix compilation error when using C++11.Tom Hughes2015-07-291-1/+1
* Internal local modifications.Bo Yang2015-07-091-1/+2
* Fix MapAllocator::destroy() bug.Feng Xiao2015-05-311-8/+6
* Fixes on visual studio 2008unknown2015-05-271-0/+6
* In std11, on mac, operator new doesn't take right reference.TeBoring2015-05-261-1/+1
* Make MapAllocator work with C++11.Feng Xiao2015-05-261-0/+12