aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util
Commit message (Expand)AuthorAgeFilesLines
* 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
| * add LIBPROTOBUF_EXPORT to make msvc happyByron Yi2017-03-161-6/+6
| * migrate delimited messages functions to util packageByron Yi2017-03-163-0/+202
* | Merge pull request #2867 from mojoBrendan/masterFeng Xiao2017-03-177-9/+86
|\ \
| * | Add option to preserve original proto field namesBrendan McCarthy2017-03-179-28/+87
| * | Add use_snake_case_for_field_names option to JsonPrintOptionsBrendan McCarthy2017-03-174-3/+21
| |/
* | Merge pull request #2837 from anandolee/masterJie Luo2017-03-172-2/+19
|\ \ | |/ |/|
| * DefaultValueObjectWriter should populate oneof message fieldJie Luo2017-03-102-2/+19
* | Use per-type table to lookup JSON name.Feng Xiao2017-03-093-10/+45
|/
* Remove the use of C++11 features.Feng Xiao2017-02-271-6/+6
* Merge pull request #2355 from xfxyjwf/fixjsonFeng Xiao2017-02-242-14/+20
|\
| * Speed up JSON parsing.Feng Xiao2016-11-102-14/+20
* | Add an option to always print enums as ints in Json APISanchay Harneja2017-02-186-1/+63
* | JsonUtilTest: Add ParsePrimitiveMapIn subtestKonstantin Podsvirov2017-02-111-1/+14
* | Merge 3.2.x branch into master (#2648)Paul Yang2017-01-319-49/+39
* | Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-174-14/+31
|\ \
| * | Add LL to large constantzhsyourai2016-11-181-4/+4
| * | Made helper code also consider package name 'proto2' when dealing with Messag...guptasu2016-11-103-10/+27
| |/
* / Integrated internal changes from GoogleAdam Cozzette2016-11-1726-247/+312
|/
* Fix MSVC stack overflow issue.Feng Xiao2016-10-101-0/+5
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 12:30:31 +0000