aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util/internal/protostream_objectwriter.h
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5109 from haberman/integrateJoshua Haberman2018-09-071-12/+21
|\
| * Down-integrate from google3.Josh Haberman2018-09-041-12/+21
* | Code fixes for the original unit test.Brandon Cole2018-08-301-0/+5
|/
* Down-integrate from google3.Feng Xiao2018-08-081-22/+29
* Add "override" for overridden virtual functionsKhuzema Pithewan2018-06-191-8/+8
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-4/+4
* Down-integrate from google3.Feng Xiao2017-03-291-4/+7
* Integrate internal changesBo Yang2016-10-101-1/+61
* Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-011-1/+6
|\
| * Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-281-1/+6
* | Integrated internal changes from GoogleAdam Cozzette2016-06-291-6/+6
|/
* Down integrate from Google internal.Jisi Liu2016-04-281-3/+8
* Integrate google internal changes.Jisi Liu2016-03-301-1/+24
* Down-integrate from internal code base.Feng Xiao2015-12-111-249/+69
* Fix compilation errors when built internally.Feng Xiao2015-11-021-1/+1
* Down-integrate from google internal.Jisi Liu2015-10-051-0/+20
* fix "memory leaks" in protostream-object files.Jisi Liu2015-08-251-1/+3
* Down-integrate from google3.Feng Xiao2015-08-221-13/+28
* Fix broken builds.Feng Xiao2015-06-171-7/+7
* Down-integrate from internal code base.Feng Xiao2015-06-151-0/+455