aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor.pb.cc
Commit message (Expand)AuthorAgeFilesLines
* Add file option php_metadata_namespace and ruby_package (#4609)Paul Yang2018-05-111-128/+257
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-864/+515
* Integrated internal changes from GoogleAdam Cozzette2017-12-011-236/+281
* Merge from google internalJisi Liu2017-10-181-576/+297
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-5648/+3073
* Make code free of missing-field-initializers warningsv3.4.0rc2Jisi Liu2017-08-091-26/+26
* Fix invalid offsetof warning.Jisi Liu2017-08-031-62/+140
* Add destructors for default instances to the shutdown code.Gerben Stavenga2017-08-021-36/+62
* Merge from masterJisi Liu2017-07-251-0/+28
* Merge master into 3.4.xJisi Liu2017-07-181-479/+763
|\
| * Support PHP generic services (#3269)Matt A2017-07-181-110/+179
| * Add space between arrow and casted type (#3353)Paul Yang2017-07-131-15/+15
| * Fix more implicit type conversions in public headers and generated code.Bo Yang2017-06-241-232/+318
| * Enusre public header and generated code have no implicit converion.Bo Yang2017-06-231-102/+105
| * Add new file option php_namespace. (#3162)Paul Yang2017-06-051-148/+272
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-737/+1195
|/
* Down-integrate from google3.Feng Xiao2017-03-291-714/+1029
* Add file option php_class_prefix (#2849)Paul Yang2017-03-171-118/+240
* Remove the use of C++11 features.Feng Xiao2017-02-271-236/+236
* Keep loop bounds in a local variable for string fields.Chris Kennelly2017-02-151-9/+9
* Keep loop bounds in a local variable.Chris Kennelly2017-02-151-10/+10
* Work with truncated tag numbers.Chris Kennelly2017-02-151-118/+236
* Expose rvalue setters for repeated string fields.Chris Kennelly2017-02-151-0/+36
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-651/+631
* Add rvalue setters for non-arena strings on C++11.Chris Kennelly2016-12-161-0/+232
* update descriptor.proto's go_packageMichael Darakananda2016-12-071-4/+5
* Add a swift_prefix file option.Thomas Van Lenten2016-11-301-116/+232
* Add a "u" suffix to tag numbers in generated codeAdam Cozzette2016-11-221-147/+147
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-3637/+2826
* Fix Visual Studio compile issues.Feng Xiao2016-10-101-108/+183
* Fix default instance destructorJisi Liu2016-10-101-9/+50
* Add back removed descriptor field.Bo Yang2016-10-101-103/+164
* Integrate internal changesBo Yang2016-10-101-1489/+1627
* Silence compile warnings in bazelAndy Hochhaus2016-10-091-8/+16
* Merge remote-tracking branch 'origin/3.0.x' into mergeJisi Liu2016-09-141-0/+25
|\
| * Fix #2032 unused parameter 'deterministic'Khing2016-09-081-0/+25
* | Fix #1955 clang-tidy warning misc-macro-parenthesesChih-Hung Hsieh2016-09-021-9/+9
|/
* Update generated files.Feng Xiao2016-07-131-63/+156
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-221/+640
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-281-0/+72
|\
* | Down integrate from Google internal.Jisi Liu2016-04-281-24/+256
|/
* Integrate google internal changes.Jisi Liu2016-03-301-120/+58
* Integrate from google internal.Jisi Liu2016-01-291-54/+915
* Down-integrate from internal code base.Feng Xiao2015-12-111-0/+1
* Use angle bracket for well known type proto header.Bo Yang2015-12-081-1/+1
* Get VS 2015 to use const int definitionsBruce Dawson2015-10-291-54/+54
* Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-051-2/+3
|\
| * Specify csharp_namespace in descriptor.protoJon Skeet2015-09-011-2/+2
* | Down-integrate from google internal.Jisi Liu2015-10-051-101/+215
|/
* Update descriptor protos.Jisi Liu2015-08-251-12/+12