aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/util/internal/proto_writer.h
Commit message (Collapse)AuthorAge
* Add "override" for overridden virtual functionsGravatar Khuzema Pithewan2018-06-19
| | | | | | Add "override" for overridden virtual functions. Please refer following issue for discussion on this. https://github.com/google/protobuf/issues/67
* Merge branch 'master' into down-integrateGravatar Adam Cozzette2018-03-13
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
| |
| * The JsonParseOptions::ignore_unknown_fields option behavior treatsGravatar Alexey Malov2018-02-12
|/ | | | unrecognized string values in enum fields as default ones.
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
|
* Fix spelling in strings and commentsGravatar Otto Kekäläinen2016-07-03
|
* Merge pull request #1704 from lizan/json_parse_optionsGravatar Feng Xiao2016-07-01
|\ | | | | Add JsonParseOptions to ignore unknown fields
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
| | | | | | | | This includes all internal changes from around May 20 to now.
| * Add JsonParseOptions to ignore unknown fieldsGravatar Lizan Zhou2016-06-28
|/ | | | | - add JsonParseOptions for JsonToBinaryString allow unknown fields - rename current JsonOptions to JsonPrintOptions
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
|
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11