aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/util/internal
Commit message (Collapse)AuthorAge
* Merge pull request #4608 from khuzemap/masterGravatar Feng Xiao2018-06-25
|\ | | | | Add "override" keyword for overridden virtual functions
* \ 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 …
* | | 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>
| * 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.
* 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
| |
* | The JsonParseOptions::ignore_unknown_fields option behavior treatsGravatar Alexey Malov2018-02-12
|/ | | | unrecognized string values in enum fields as default ones.
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
|
* Merge from google internalGravatar Jisi Liu2017-10-18
|
* Move namespace closing brace inside the header guard blockGravatar Francois Marier2017-10-12
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
|
* Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
|
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|
* 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
| | * 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
| |/ |/|
| * DefaultValueObjectWriter should populate oneof message fieldGravatar Jie Luo2017-03-10
| |
* | Use per-type table to lookup JSON name.Gravatar Feng Xiao2017-03-09
|/ | | | | | | Different fields from different messages can map to the same JSON name and the original global lookup table is only capable of mapping one of such fields. This change converts the global table to per-type tables so fields from different messages won't conflict.
* Add an option to always print enums as ints in Json APIGravatar Sanchay Harneja2017-02-18
| | | | https://github.com/google/protobuf/issues/2735
* Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Down-integrate internal changes to github. * Update conformance test failure list. * Explicitly import used class in nano test to avoid random test fail. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * maps_test.js: check whether Symbol is defined before using it (#2524) Symbol is not yet available on older versions of Node.js and so this test fails with them. This change just directly checks whether Symbol is available before we try to use it. * Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up * Updated Makefile.am to fix out-of-tree builds * Added Bazel genrule for generating well_known_types_embed.cc In pull request #2517 I made this change for the CMake and autotools builds but forgot to do it for the Bazel build. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * Add new js file in extra dist. * Bump version number to 3.2.0 * Fixed issue with autoloading - Invalid paths (#2538) * PHP fix int64 decoding (#2516) * fix int64 decoding * fix int64 decoding + tests * Fix int64 decoding on 32-bit machines. * Fix warning in compiler/js/embed.cc embed.cc: In function ‘std::string CEscape(const string&)’: embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < str.size(); ++i) { ^ * Fix include in auto-generated well_known_types_embed.cc Restore include style fix (e3da722) that has been trampled by auto-generation of well_known_types_embed.cc * Fixed cross compilations with the Autotools build Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed. * Minor fix for autocreated object repeated fields and maps. - If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list. * Fix generation of extending nested messages in JavaScript (#2439) * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build * Fix generated code when there is no namespace but there is enum definition. * Decoding unknown field should succeed. * Add embed.cc in src/Makefile.am to fix dist check. * Fixed "make distcheck" for the Autotools build To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES. * Remove redundent embed.cc from src/Makefile.am * Update version number to 3.2.0-rc.1 (#2578) * Change protoc-artifacts version to 3.2.0-rc.1 * Update version number to 3.2.0rc2 * Update change logs for 3.2.0 release. * Update php README * Update upb, fixes some bugs (including a hash table problem). (#2611) * Update upb, fixes some bugs (including a hash table problem). * Ruby: added a test for the previous hash table corruption. Verified that this triggers the bug in the currently released version. * Ruby: bugfix for SEGV. * Ruby: removed old code for dup'ing defs. * Reverting deployment target to 7.0 (#2618) The Protobuf library doesn’t require the 7.1 deployment target so reverting it back to 7.0 * Fix typo that breaks builds on big-endian (#2632) * Bump version number to 3.2.0
* Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| |
| * Add LL to large constantGravatar zhsyourai2016-11-18
| | | | | | Some compiler will report: 'error: integer constant is too large for long type'
| * Made helper code also consider package name 'proto2' when dealing with ↵Gravatar guptasu2016-11-10
|/ | | | | | MessageOptions. This is done so that the same library can be used irrespective of whether MessageOptions belong to package name 'proto2' or 'google.protobuf'
* Fix MSVC stack overflow issue.Gravatar Feng Xiao2016-10-10
|
* Fix VS test failures.Gravatar Feng Xiao2016-10-10
|
* Reduce test length to avoid stack overflow on VS.Gravatar Feng Xiao2016-10-10
|
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Fixes static analyzer issues from xcode.Gravatar Sergio Campama2016-09-20
|
* fix #1342 cause by ownership issuesGravatar mike070262016-09-01
|
* Restore New*Callback into google::protobuf namespace since these are used by ↵Gravatar Srivats P2016-08-29
| | | | | | the service stubs code Fixes #1966
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
|
* Merge pull request #1753 from xfxyjwf/fixupGravatar Jisi Liu2016-07-07
|\ | | | | Fix problems detected when integrating the code to our internal repo.
| * Fix data member declaration order.Gravatar Feng Xiao2016-07-06
| |
* | 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
* Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
|
* Do not use C++11 unicode escape in unittest.Gravatar Jisi Liu2016-04-01
| | | | For fixing MSVC
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
|
* Integrate from google internal.Gravatar Jisi Liu2016-01-29
| | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.
* Fix for Visual Studio 2008.Gravatar Feng Xiao2015-12-30
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 11:48:54 +0000