aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/util
Commit message (Collapse)AuthorAge
* 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
| |
* | 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.
* Remove the use of C++11 features.Gravatar Feng Xiao2017-02-27
|
* Merge pull request #2355 from xfxyjwf/fixjsonGravatar Feng Xiao2017-02-24
|\ | | | | Speed up JSON parsing.
* | Add an option to always print enums as ints in Json APIGravatar Sanchay Harneja2017-02-18
| | | | | | | | https://github.com/google/protobuf/issues/2735
* | JsonUtilTest: Add ParsePrimitiveMapIn subtestGravatar Konstantin Podsvirov2017-02-11
| |
* | 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'
| | * Speed up JSON parsing.Gravatar Feng Xiao2016-11-10
| |/ |/| | | | | | | | | | | | | | | | | | | It turns out calling StringOutputStream::Next()/BackUp() repeatedly is very costly in opensource protobuf because it keeps resize() the string back and forth. The current JSON conversion API suffers this problem and leads to ridiculously long parsing time: https://github.com/google/protobuf/issues/2305#issuecomment-257785492 This change fixes the problem but caching the buffer of Next() and avoid calling BackUp() as much as possible.
| * 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
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 09:54:39 +0000