aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add Ruby compatibilty test against 3.0.0.Feng Xiao2017-02-2711-1/+2009
|
* Merge pull request #2753 from thomasvl/recursive_dropThomas Van Lenten2017-02-233-0/+324
|\ | | | | Add GPBMessageDropUnknownFieldsRecursively() and tests.
| * Add GPBMessageDropUnknownFieldsRecursively() and tests.Thomas Van Lenten2017-02-233-0/+324
|/ | | | | GPBMessageDropUnknownFieldsRecursively() is a new helper to drop the unknownFields from a message and all sub messages (in fields or extensions).
* Updating READMEJohn Brock2017-02-231-2/+52
| | | | | - Adding more detail on running tests - Adding info about the status of .NET 3.5 support and how to enable .NET 3.5
* Upgrading test-related librariesJohn Brock2017-02-231-2/+2
| | | | | NUnit 3.4.0 —> 3.6.0 dotnet-test-nunit 3.4.0-alpha-2 —> 3.4.0-beta-3
* Fixes for .NET 3.5 compatibilityJohn Brock2017-02-2313-13/+154
| | | | | * Changing DOTNET35 framework symbols in preprocessor directives to the default built-in value of NET35. * Adding extension method StreamExtension.CopyTo for .NET 3.5 because it didn’t exist until .NET 4, and adding associated unit tests.
* Merge pull request #2736 from na-ka-na/master3Feng Xiao2017-02-216-1/+63
|\ | | | | Add an option to always print enums as ints in Json API
| * Add an option to always print enums as ints in Json APISanchay Harneja2017-02-186-1/+63
|/ | | | https://github.com/google/protobuf/issues/2735
* Merge pull request #2722 from ckennelly/unifiedAdam Cozzette2017-02-1622-236/+725
|\ | | | | Merge #2653, #2622, #2579, #2652
| * Keep loop bounds in a local variable for string fields.Chris Kennelly2017-02-155-21/+21
| |
| * Keep loop bounds in a local variable.Chris Kennelly2017-02-153-14/+14
| |
| * Work with truncated tag numbers.Chris Kennelly2017-02-1512-201/+402
| | | | | | | | | | This allows more compact comparisons (1 byte instead of 4 byte immediates on x86) for each possible wire/tag inside each field.
| * Expose rvalue setters for repeated string fields.Chris Kennelly2017-02-1512-0/+288
|/ | | | rvalue setters for scalar string fields were added in #2506.
* Merge pull request #2663 from ckennelly/varint-sizeAdam Cozzette2017-02-152-26/+17
|\ | | | | Inline branch-less VarintSize32/VarintSize64 implementations.
| * Inline branch-less VarintSize32/VarintSize64 implementations.Chris Kennelly2017-02-022-26/+17
| |
* | Merge pull request #2689 from ckennelly/aliasing-fixed32-fixed64Adam Cozzette2017-02-141-4/+2
|\ \ | | | | | | Avoid aliasing CodedInputStream::buffer_ when parsing little endian integers
| * | Avoid aliasing CodedInputStream::buffer_ when parsing little endian integers.Chris Kennelly2017-02-071-4/+2
| | | | | | | | | | | | | | | This eliminates an unnecessary reload of buffer_ that occurs (before this change) after the store to *value.
* | | Improve support for plugin parameters.Thomas Van Lenten2017-02-142-3/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | --[name]_opt support depended on the plugin being register, and didn't support working with just --[name]_out directive (where the plugin is found via the users PATH. This extends the command line handing to allow --[name]_out to be all it takes for the _opt directive to also be supported. Fixes https://github.com/google/protobuf/issues/2712
* | | Merge pull request #2609 from yixiang/patch-1Feng Xiao2017-02-131-0/+10
|\ \ \ | | | | | | | | Undef TYPE_BOOL to avoid conflict with iOS.
| * | | Undef TYPE_BOOL to avoid conflict with iOS.Sean Lu2017-01-191-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TYPE_BOOL is defined as a macro in <ConditionalMacros.h>, which gets implicitly included in almost all iOS source files. This fixes complaints like http://go/soverflow/15759559 For some context, here is how TYPE_BOOL is defined in ConditionalMacros.h #ifdef __cplusplus #define TYPE_BOOL 1 #else #define TYPE_BOOL 0 #endif
* | | | Merge pull request #2701 from anandolee/masterJie Luo2017-02-1337-1/+7893
|\ \ \ \ | | | | | | | | | | Add csharp compatibility tests against v3.0.0
| * | | | Add csharp compatibility tests against v3.0.0 and run on Travis.Jie Luo2017-02-102-1/+106
| | | | |
| * | | | Add proto and test files for csharp compatibility tests against v3.0.0.Jie Luo2017-02-0935-0/+7787
| | | | | | | | | | | | | | | | | | | | All the files are copied from 3.0.0 (JosnFormaterTest was deleted)
* | | | | Merge pull request #2451 from podsvirov/json-primitive-mapFeng Xiao2017-02-131-1/+14
|\ \ \ \ \ | | | | | | | | | | | | JsonUtilTest: Add ParsePrimitiveMapIn subtest
| * | | | | JsonUtilTest: Add ParsePrimitiveMapIn subtestKonstantin Podsvirov2017-02-111-1/+14
| | | | | |
* | | | | | Merge pull request #2704 from liutikas/masterFeng Xiao2017-02-131-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix compiler warnings about unused variables in wire_format.h
| * | | | | | Fix compiler warnings about unused variables in wire_format.hAurimas Liutikas2017-02-101-0/+3
| | | | | | |
* | | | | | | Add clear method to PHP message (#2700)Paul Yang2017-02-1110-12/+277
|/ / / / / /
* | | | | | Switch to gcc atomic intrinsics for macOS and delete the file that uses (#2699)Jonathan Hseu2017-02-104-235/+3
| | | | | | | | | | | | | | | | | | the deprecated atomics.
* | | | | | Merge pull request #2656 from pcj/patch-1Feng Xiao2017-02-101-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add bazel protobuf resources
| * | | | | | Add bazel protobuf resourcesPaul Cody Johnston2017-02-011-0/+4
| | | | | | |
* | | | | | | Merge pull request #2647 from anandolee/masterJie Luo2017-02-092-11/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | Fix python compatibility test
| * | | | | Fix python compatibility test when a new generated code imports an old ↵Jie Luo2017-02-092-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | version(2.6.1 or older) generated code.
* | | | | | Merge pull request #2692 from cgrushko/patch-3Feng Xiao2017-02-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update load() statement to latest style
| * | | | | | Update load() statement to latest stylecgrushko2017-02-081-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | The first argument is currently implicitly a .bzl file. Change this to be explicit.
* | | | | | Merge pull request #2691 from cgrushko/patch-3Feng Xiao2017-02-081-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bazel can build protobuf when it's not in the root
| * | | | | | Bazel can build protobuf when it's not in the rootcgrushko2017-02-081-2/+3
| | |_|_|/ / | |/| | | | | | | | | | That is, Bazel can now build protobuf when the latter resides in a subdirectory of a project.
* / | | | | Implement json encoding decoding for php. (#2682)Paul Yang2017-02-089-390/+179
|/ / / / /
* | | | | Add fixed version to phpunit used in travis (#2673)Paul Yang2017-02-071-1/+1
| | | | |
* | | | | Merge pull request #2681 from sergiocampama/spacesThomas Van Lenten2017-02-072-55/+55
|\ \ \ \ \ | | | | | | | | | | | | Removes trailing whitespaces
| * | | | | Removes trailing whitespacesSergio Campama2017-02-072-55/+55
|/ / / / /
* | | | | Update upb for php. (#2662)Paul Yang2017-02-064-936/+2245
| | | | |
* | | | | Fix CopyTo argument validationJon Skeet2017-02-062-2/+18
| |_|_|/ |/| | | | | | | | | | | Fixes #2669.
* | | | Add conformance test for php (#2655)Paul Yang2017-02-016-7/+1422
| |/ / |/| |
* | | Merge 3.2.x branch into master (#2648)Paul Yang2017-01-31146-4556/+6828
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 pull request #2226 from kchodorow/masterJoshua Haberman2017-01-301-6/+24
|\ \ \ | | | | | | | | Create paths for external repositories in a way that is forward and backward compatible
| * | | Update genfiles paths to work with a different execroot arrangementKristina Chodorow2017-01-251-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | Bazel is changing the way the execution root is organized (see https://github.com/bazelbuild/bazel/issues/1681 for details) and this updates the protobuf path logic to work with both old and new versions of Bazel.
* | | | C#: Implement IReadOnlyList<T> in RepeatedField<T>Jon Skeet2017-01-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We explicitly don't do this when targeting .NET 3.5, where the interface doesn't exist. No implementation is required, as we're already implementing everything we need for IList<T>.
* | | | Merge pull request #2639 from anandolee/masterJie Luo2017-01-283-116/+116
|\ \ \ \ | | |/ / | |/| | Add Oneof custom options test
| * | | Add Oneof custom options testJie Luo2017-01-273-116/+116
| | | |