aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor.cc
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-1/+3
* Down-integrate from google3.Feng Xiao2018-08-081-129/+164
* Merge pull request #4882 from google/3.6.xAdam Cozzette2018-07-091-70/+27
|\
| * Fix initialization with Visual StudioAdam Cozzette2018-07-061-70/+27
* | Merge pull request #4827 from acozzette/merge-3-6-xAdam Cozzette2018-06-251-8/+6
|\ \
| * | Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-06-251-8/+6
| |\|
| | * Make sure to delete temporary maps used by FileDescriptorTablesAdam Cozzette2018-05-241-8/+6
* | | Merge pull request #4608 from khuzemap/masterFeng Xiao2018-06-251-3/+3
|\ \ \ | |/ / |/| |
| * | Add "override" for overridden virtual functionsKhuzema Pithewan2018-06-191-3/+3
| |/
* / Remove undefined behavior from the hash function.Eugene Hermann2018-05-141-7/+7
|/
* source code info for interpreted options; fix source code info for extension ...Joshua Humphries2018-03-261-34/+196
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-26/+30
* Integrated internal changes from GoogleAdam Cozzette2017-12-011-47/+65
* Fix undefined memory management found by Clang's sanitizers.John Millikin2017-10-161-2/+4
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-60/+277
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-13/+79
* Down-integrate from google3.Feng Xiao2017-03-291-192/+487
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-0/+8
* Allow OneofOptions to be extended in proto3.Jie Luo2017-01-251-1/+1
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-106/+175
* Do strict enum name checking only for proto3Adam Cozzette2016-10-101-5/+14
* Integrate internal changesBo Yang2016-10-101-11/+187
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-1/+20
* Down integrate from Google internal.Jisi Liu2016-04-281-12/+21
* Merge branch master into v3.0.0-beta-2Feng Xiao2015-12-211-3/+28
|\
| * Initialize singleton instance by GoogleOnceInit()Kenichiro IDA2015-12-191-2/+24
| * Alter FileDescriptorTables::kEmpty to GetEmptyInstance()Kenichiro IDA2015-12-171-3/+6
* | Down-integrate from internal code base.Feng Xiao2015-12-111-11/+24
|/
* Get VS 2015 to use const int definitionsBruce Dawson2015-10-291-1/+1
* Down-integrate from google internal.Jisi Liu2015-10-051-3/+88
* Down-integrate from google3.Feng Xiao2015-08-221-3/+21
* down-integrate internal changesBo Yang2015-05-211-11/+172
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-28/+60
* Delete some globals in ShutdownProtobufLibrary().Feng Xiao2014-12-031-0/+5
* Get rid of some build warnings.Feng Xiao2014-12-021-0/+2
* Down-integrate from internal code base.Feng Xiao2014-11-201-2/+14
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-141-6/+7
* Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobu...Feng Xiao2014-11-111-1/+1
|\
| * typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-081-1/+1
* | Down-integrate from internal code base.Feng Xiao2014-11-101-113/+606
|/
* Replace links to code.google.com/protobuf with developers.google.com/protocol...Feng Xiao2014-10-011-1/+1
* add #ifdef _MSC_VERjieluo@google.com2014-08-011-2/+2
* change some files to pass MSVC 2013jieluo@google.com2014-07-311-0/+6
* delete unused variablejieluo@google.com2014-07-181-2/+0
* down integrate to svnjieluo@google.com2014-07-181-136/+601
* Down-integrate pending changes from internal repository after previous release.liujisi@google.com2014-05-281-8/+12
* Replace kEmptyString wth OnceInit initialized string*xiaofeng@google.com2014-02-131-5/+3
* Generate a warning for duplicated enum values, when allow_alias option isn'tliujisi@google.com2012-12-281-6/+16
* Make custom option able to work for -f-no-rtti; Fix remaining death tests for...liujisi@google.com2012-12-051-1/+5
* Use string::size_type instead of int for results of string.find() etc. -- pat...xiaofeng@google.com2012-09-271-1/+1