aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5109 from haberman/integrateJoshua Haberman2018-09-0736-232/+355
|\
| * Down-integrate from google3.Josh Haberman2018-09-0436-232/+355
* | Also make sure known fields come across as expectedBrandon Cole2018-08-301-1/+6
* | Code fixes for the original unit test.Brandon Cole2018-08-302-1/+18
* | Add unit test for loading unknown fields in Any messagesBrandon Cole2018-08-301-0/+18
|/
* Replace repo links.Feng Xiao2018-08-227-9/+9
* Down-integrate from google3.Feng Xiao2018-08-0858-840/+1342
* Merge pull request #4824 from sschuberth/remove-exec-bitFeng Xiao2018-06-251-0/+0
|\
| * Remove the executable bit from several source code filesSebastian Schuberth2018-06-251-0/+0
* | Merge pull request #4608 from khuzemap/masterFeng Xiao2018-06-2514-78/+82
|\ \ | |/ |/|
| * Add "override" for overridden virtual functionsKhuzema Pithewan2018-06-1914-79/+83
* | Merge pull request #4813 from htuch/fix-any-in-mapFeng Xiao2018-06-214-2/+21
|\ \
| * | protostream_objectwriter: fix bug when Any is directly embedded in a map.Harvey Tuch2018-06-214-2/+21
* | | Merge pull request #4812 from htuch/fix-any-caseFeng Xiao2018-06-213-0/+88
|\ \ \
| * | | Added TODO for grouping options.Harvey Tuch2018-06-211-0/+3
| * | | protostream_objectsource: preserve print options across Any.Harvey Tuch2018-06-213-0/+85
| |/ /
* | | Additional whitespace.Harvey Tuch2018-06-211-1/+1
* | | json: include field name in InvalidName status messages.Harvey Tuch2018-06-211-1/+2
|/ /
* / proto_writer.h: RenderBytes is an override. Marking it. (#4707)medinandres2018-06-181-1/+1
|/
* typoBrady Killeen2018-04-261-1/+1
* Merge branch 'master' into fixbug_enum2json2stone47742018-03-2234-322/+386
|\
| * Merge branch 'master' into down-integrateAdam Cozzette2018-03-135-6/+72
| |\
| * | Integrated internal changes from GoogleAdam Cozzette2018-03-1334-322/+386
* | | Use the first enum value instead of 0 in DefaultValueObjectWriter::FindEnumDe...stone47742018-03-211-1/+1
* | | Fix bug: whether always_print_enums_as_ints is true or false, it always print...stone47742018-03-195-17/+66
| |/ |/|
* | Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJsonFeng Xiao2018-02-265-6/+72
|\ \ | |/ |/|
| * The JsonParseOptions::ignore_unknown_fields option behavior treatsAlexey Malov2018-02-125-6/+72
* | Removed using statements from common.hAdam Cozzette2018-01-262-2/+2
|/
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-1/+1
|\
| * Replace C++11 only method std::map::atJisi Liu2017-12-191-1/+1
* | line breaks adjstedUbuntu2017-12-201-5/+12
* | formatting issuesUbuntu2017-12-202-8/+11
* | resolve issue 4032 and added a unit testUbuntu2017-12-192-1/+17
* | Clarify default value behavior in JSON conversion.Feng Xiao2017-12-121-4/+4
* | Integrated internal changes from GoogleAdam Cozzette2017-12-0113-57/+86
|/
* Merge from google internalJisi Liu2017-10-187-38/+179
* Fix undefined memory management found by Clang's sanitizers.John Millikin2017-10-162-4/+6
* Move namespace closing brace inside the header guard blockFrancois Marier2017-10-121-1/+1
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-1/+1
* Merge master into 3.4.xJisi Liu2017-07-181-21/+21
|\
| * Removing undefined behavior and compiler warnings (#1315)brian-peloton2017-05-231-21/+21
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-1814-57/+490
|/
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-2720-253/+268
|\
| * Down-integrate from google3.Feng Xiao2017-03-2920-255/+268
* | Merge pull request #3018 from acozzette/using-namespace-stdAdam Cozzette2017-04-261-1/+1
|\ \
| * | Remove "using namespace std" from stubs/common.hAdam Cozzette2017-04-261-1/+1
| |/
* / Remove unused constants.Jakob Buchgraber2017-04-251-2/+0
|/
* Merge pull request #2861 from byronyi/#710Adam Cozzette2017-03-203-0/+202
|\
| * Update delimited_message_util_test.ccBairen Yi2017-03-181-1/+1
| * fix several issuesByron Yi2017-03-173-15/+15
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-12 18:14:36 +0000