aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/util
Commit message (Collapse)AuthorAge
* Merge pull request #4824 from sschuberth/remove-exec-bitGravatar Feng Xiao2018-06-25
|\ | | | | Remove the executable bit from several source code files
* \ Merge pull request #4608 from khuzemap/masterGravatar Feng Xiao2018-06-25
|\ \ | | | | | | Add "override" keyword for overridden virtual functions
| | * Remove the executable bit from several source code filesGravatar Sebastian Schuberth2018-06-25
| |/ |/| | | | | This potentially avoids compiler warnings.
* | Merge pull request #4813 from htuch/fix-any-in-mapGravatar Feng Xiao2018-06-21
|\ \ | | | | | | protostream_objectwriter: fix bug when Any is directly embedded in a …
* \ \ Merge pull request #4812 from htuch/fix-any-caseGravatar Feng Xiao2018-06-21
|\ \ \ | | | | | | | | protostream_objectsource: preserve print options across Any.
| * | | Added TODO for grouping options.Gravatar Harvey Tuch2018-06-21
| | | | | | | | | | | | | | | | Signed-off-by: Harvey Tuch <htuch@google.com>
| | * | protostream_objectwriter: fix bug when Any is directly embedded in a map.Gravatar Harvey Tuch2018-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This came up when trying to round-trip the JSON<->proto3 conversion for Envoy's envoy.admin.v2alpha.ConfigDump (https://github.com/envoyproxy/envoy/blob/b903c1dc984593f8e95e0569c1503dc5d85fbe34/api/envoy/admin/v2alpha/config_dump.proto#L29). Validated fix on the Envoy code base and via the provided unit test. Signed-off-by: Harvey Tuch <htuch@google.com>
| * | | protostream_objectsource: preserve print options across Any.Gravatar Harvey Tuch2018-06-21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4771. Based on the solution included in the issues from @wangjinhua. Validated this works with Envoy's /config_dump JSON rendering. Signed-off-by: Harvey Tuch <htuch@google.com>
* | | Additional whitespace.Gravatar Harvey Tuch2018-06-21
| | | | | | | | | | | | Signed-off-by: Harvey Tuch <htuch@google.com>
* | | json: include field name in InvalidName status messages.Gravatar Harvey Tuch2018-06-21
|/ / | | | | | | | | | | | | | | This is invaluable for chasing down the culprit in failed JSON -> proto conversions. We often see in Envoy that a failed JSON (or indirectly via YAML) configuration won't load but it's unclear why. Signed-off-by: Harvey Tuch <htuch@google.com>
| * 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
* | proto_writer.h: RenderBytes is an override. Marking it. (#4707)Gravatar medinandres2018-06-18
|/ | | * proto_writer.h: RenderBytes is an override. Marking it.
* typoGravatar Brady Killeen2018-04-26
|
* Merge branch 'master' into fixbug_enum2json2Gravatar stone47742018-03-22
|\
* | Use the first enum value instead of 0 in ↵Gravatar stone47742018-03-21
| | | | | | | | DefaultValueObjectWriter::FindEnumDefault
* | Fix bug: whether always_print_enums_as_ints is true or false, it always ↵Gravatar stone47742018-03-19
| | | | | | | | print the default value of enums as strings
| * Merge branch 'master' into down-integrateGravatar Adam Cozzette2018-03-13
| |\ | |/ |/|
| * Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
| |
* | Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJsonGravatar Feng Xiao2018-02-26
|\ \ | |/ |/| Adds an option in C++ JSON parser to ignore unrecognized enum values
| * The JsonParseOptions::ignore_unknown_fields option behavior treatsGravatar Alexey Malov2018-02-12
| | | | | | | | unrecognized string values in enum fields as default ones.
* | Removed using statements from common.hGravatar Adam Cozzette2018-01-26
|/ | | | | | These statements pulled a bunch of symbols from the std namespace into the global namespace. This commit removes all of them except for std::string, which is a bit trickier to remove.
* Merge remote-tracking branch 'origin/3.5.x' into masterGravatar Jisi Liu2018-01-03
|\
* | line breaks adjstedGravatar Ubuntu2017-12-20
| |
* | formatting issuesGravatar Ubuntu2017-12-20
| |
| * Replace C++11 only method std::map::atGravatar Jisi Liu2017-12-19
| |
* | resolve issue 4032 and added a unit testGravatar Ubuntu2017-12-19
| |
* | Clarify default value behavior in JSON conversion.Gravatar Feng Xiao2017-12-12
| | | | | | | | Make it clear default value is only omitted for proto3.
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
|/
* Merge from google internalGravatar Jisi Liu2017-10-18
|
* Fix undefined memory management found by Clang's sanitizers.Gravatar John Millikin2017-10-16
| | | | See https://github.com/google/protobuf/issues/3752 for context.
* Move namespace closing brace inside the header guard blockGravatar Francois Marier2017-10-12
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
|
* Merge master into 3.4.xGravatar Jisi Liu2017-07-18
|\
* | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| |
| * Removing undefined behavior and compiler warnings (#1315)Gravatar brian-peloton2017-05-23
|/ | | | | | | | | | | | | | | | | | | * Comment out unused arguments. These last few are all that's needed to compile with -Wunused-arguments. * Fix missing struct field initializer. With this fix, everything compiles with -Wmissing-field-initializers. * Add support for disabling unaligned memory accesses on x86 too. ubsan doesn't like these because they are technically undefined behavior, so -DGOOGLE_PROTOBUF_DONT_USE_UNALIGNED will disable them easily. * Avoid undefined integer overflow. ubsan catches all of these.
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterGravatar Adam Cozzette2017-04-27
|\
* \ Merge pull request #3018 from acozzette/using-namespace-stdGravatar Adam Cozzette2017-04-26
|\ \ | | | | | | Remove "using namespace std" from stubs/common.h
| * | Remove "using namespace std" from stubs/common.hGravatar Adam Cozzette2017-04-26
| | | | | | | | | | | | | | | | | | | | | | | | This prevents the contents of the std namespace from being effectively pulled into the top-level namespace in all translation units that include common.h. I left in individual using statements for a few common things like std::set and std::map, because it did not seem worth going through the churn of updating the whole codebase to fix those right now.
* | | Remove unused constants.Gravatar Jakob Buchgraber2017-04-25
|/ / | | | | | | | | When compiling with -Werror, -Wunused-const-variable the build fails due to those two constants not being used.
| * Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|/
* Merge pull request #2861 from byronyi/#710Gravatar Adam Cozzette2017-03-20
|\ | | | | migrate delimited messages functions to util package
* \ Merge pull request #2867 from mojoBrendan/masterGravatar Feng Xiao2017-03-17
|\ \ | | | | | | Add preserve_proto_field_names option to JsonPrintOptions
* \ \ Merge pull request #2837 from anandolee/masterGravatar Jie Luo2017-03-17
|\ \ \ | | | | | | | | DefaultValueObjectWriter should populate oneof message field
| | | * Update delimited_message_util_test.ccGravatar Bairen Yi2017-03-18
| | | |
| | * | Add option to preserve original proto field namesGravatar Brendan McCarthy2017-03-17
| | | |
| | * | Add use_snake_case_for_field_names option to JsonPrintOptionsGravatar Brendan McCarthy2017-03-17
| |/ / |/| |
| | * fix several issuesGravatar Byron Yi2017-03-17
| | |
| | * add LIBPROTOBUF_EXPORT to make msvc happyGravatar Byron Yi2017-03-16
| | |
| | * migrate delimited messages functions to util packageGravatar Byron Yi2017-03-16
| |/ |/|
| * DefaultValueObjectWriter should populate oneof message fieldGravatar Jie Luo2017-03-10
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-27 22:01:03 +0000