aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #2785 from thomasvl/threading_raceGravatar Thomas Van Lenten2017-03-02
|\ | | | | Handing threading race resolving methods.
| * Handing threading race resolving methods.Gravatar Thomas Van Lenten2017-03-02
|/ | | | | | | - Don't prune the extension registry as that can lead to failures when two threads are racing. - If adding the method fails, check and see if it already is bound to decide the return result. Deals with threading races binding the methods.
* Merge pull request #2774 from acozzette/closure-builderGravatar Adam Cozzette2017-03-02
|\ | | | | Use closurebuilder.py in favor of calcdeps.py for compiling JavaScript
* | Disable static analyzer for message semaphore creation (#2748)Gravatar Sergio Campamá2017-03-01
| | | | | | | | Disable static analyzer for message semaphore creation
* | Fix gcc 4.1 build (#1035) (#1913)Gravatar Matt Hauck2017-03-01
| | | | | | | | | | | | | | | | | | | | * Fix gcc 4.1.2 compilation of map_field_inl.h Fixes "error: object missing in reference to '...'" errors from #1035 * Disable 64-bit map keys on gcc <= 4.1 * Add missing case statements
* | Change hint type to `const void*` (#2568)Gravatar Matt Hauck2017-03-01
| | | | | | This is both more correct, and the build fails on AIX without it
* | Add mergeFrom method on Message (#2766)Gravatar Paul Yang2017-03-01
| | | | | | | | | | | | | | | | This method merges the contents of the specified message into the current message. Singular fields that are set in the specified message overwrite the corresponding fields in the current message. Repeated fields are appended. Map fields key-value pairs are overritten. Singular/Oneof sub-messages are recursively merged. All overritten sub-messages are deep-copied.
| * Use closurebuilder.py in favor of calcdeps.py for compiling JavaScriptGravatar Adam Cozzette2017-03-01
|/ | | | | | | | | | There are two motivations for this: 1) calcdeps.py is deprecated and replaced by closurebuilder.py. 2) As part of this I was able to tweak things so that the Closure compiler does not attempt to examine every .js file in the tree under js/. This makes it possible to put compatibility tests and related files in a subdirectory without them getting mixed up with the main .js files we care about.
* Merge pull request #2674 from acozzette/js-test-cleanupGravatar Adam Cozzette2017-03-01
|\ | | | | Removed log statement from writer_test.js
| * Removed log statement from writer_test.jsGravatar Adam Cozzette2017-02-28
|/ | | | | This tweak makes the test output a bit easier to read because it cuts out a lot of unnecessary logging.
* Merge pull request #2770 from xfxyjwf/fixcmakeGravatar Jisi Liu2017-02-28
|\ | | | | Remove the use of C++11 features.
* \ Merge pull request #2772 from sschuberth/masterGravatar Feng Xiao2017-02-28
|\ \ | | | | | | Fix links to the license in meta-data
* | | There might be duplicated enum values when allow_alias is true. Add ↵Gravatar Jie Luo2017-02-28
| | | | | | | | | | | | PreferredAlias into OriginalNameAttribute to remove the duplication (#2727)
| * | Prefer the term "3-Clause BSD License" over "New BSD License"Gravatar Sebastian Schuberth2017-02-28
| | | | | | | | | | | | The first is the newer name, which is also more telling.
| * | Fix links to the New BSD License in meta-dataGravatar Sebastian Schuberth2017-02-28
|/ / | | | | | | | | The "New BSD License" is the "3-Clause BSD License", but the links were pointing to the "2-Clause BSD License".
| * Remove the use of C++11 features.Gravatar Feng Xiao2017-02-27
| |
* | Merge pull request #2733 from wmamrak/patch-1Gravatar Adam Cozzette2017-02-27
|\ \ | | | | | | Disable MSVC warning C4309
* \ \ Merge pull request #2729 from MarcelRaad/fix_inline_msvc12Gravatar Adam Cozzette2017-02-27
|\ \ \ | |_|/ |/| | Fix unresolved symbols with MSVC12 and /Zc:inline
* | | Merge pull request #2355 from xfxyjwf/fixjsonGravatar Feng Xiao2017-02-24
|\ \ \ | | | | | | | | Speed up JSON parsing.
* \ \ \ Merge pull request #2732 from AsturaPhoenix/masterGravatar Adam Cozzette2017-02-24
|\ \ \ \ | | | | | | | | | | const FieldDescriptorCompare
* \ \ \ \ Merge pull request #2747 from liutikas/masterGravatar Adam Cozzette2017-02-24
|\ \ \ \ \ | | | | | | | | | | | | Fix unused variables warnings in generated_message_reflection.h
* \ \ \ \ \ Merge pull request #2734 from msabramo/patch-1Gravatar Adam Cozzette2017-02-24
|\ \ \ \ \ \ | | | | | | | | | | | | | | README.md: Make docs URL a link
* \ \ \ \ \ \ Merge pull request #2630 from blodan/masterGravatar Jisi Liu2017-02-24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | FreeBSD compatibility
* \ \ \ \ \ \ \ Merge pull request #2753 from thomasvl/recursive_dropGravatar Thomas Van Lenten2017-02-23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add GPBMessageDropUnknownFieldsRecursively() and tests.
| * | | | | | | | Add GPBMessageDropUnknownFieldsRecursively() and tests.Gravatar Thomas Van Lenten2017-02-23
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GPBMessageDropUnknownFieldsRecursively() is a new helper to drop the unknownFields from a message and all sub messages (in fields or extensions).
* | | | | | | | Updating READMEGravatar John Brock2017-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 librariesGravatar John Brock2017-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 compatibilityGravatar John Brock2017-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | | * | | | | Fix compiler warnings about unused variables in generated_message_reflection.hGravatar Aurimas Liutikas2017-02-22
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #2736 from na-ka-na/master3Gravatar Feng Xiao2017-02-21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add an option to always print enums as ints in Json API
| * | | | | | | Add an option to always print enums as ints in Json APIGravatar Sanchay Harneja2017-02-18
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | https://github.com/google/protobuf/issues/2735
| | * / / / / README.md: Make docs URL a linkGravatar Marc Abramowitz2017-02-18
| |/ / / / / |/| | | | | | | | | | | Dedent URL so it renders as a link and not as code (fixed width font and not clickable).
| | | | | * Disable MSVC warning C4309Gravatar Wojciech Mamrak2017-02-18
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | > warning C4309: static_cast': truncation of constant value introduced in commit 9db5b11c9cf2922435b53495b9c1e114525f0428
| | * | | const FieldDescriptorCompareGravatar Ross Wang2017-02-17
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Clang now validates that <set> comparators must have a const operator(): https://reviews.llvm.org/rL291969 Discussion: https://groups.google.com/d/msg/protobuf/9W6zFIHaJ-4/9RrfwelpEQAJ
| | | * Fix unresolved symbols with MSVC12 and /Zc:inlineGravatar Marcel Raad2017-02-17
| |_|/ |/| | | | | | | | | | | | | | | | | In #726 and #813, linking errors with MSVC14 were resolved. The change in MSVC12 leading to these errors was not a newly introduced bug, but that /Zc:inline was made on by default. This option is also available with MSVC12, so the workaround should be applied for it too.
* | | Merge pull request #2722 from ckennelly/unifiedGravatar Adam Cozzette2017-02-16
|\ \ \ | | | | | | | | Merge #2653, #2622, #2579, #2652
| * | | Keep loop bounds in a local variable for string fields.Gravatar Chris Kennelly2017-02-15
| | | |
| * | | Keep loop bounds in a local variable.Gravatar Chris Kennelly2017-02-15
| | | |
| * | | Work with truncated tag numbers.Gravatar Chris Kennelly2017-02-15
| | | | | | | | | | | | | | | | | | | | 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.Gravatar Chris Kennelly2017-02-15
|/ / / | | | | | | | | | rvalue setters for scalar string fields were added in #2506.
* | | Merge pull request #2663 from ckennelly/varint-sizeGravatar Adam Cozzette2017-02-15
|\ \ \ | | | | | | | | Inline branch-less VarintSize32/VarintSize64 implementations.
* \ \ \ Merge pull request #2689 from ckennelly/aliasing-fixed32-fixed64Gravatar Adam Cozzette2017-02-14
|\ \ \ \ | | | | | | | | | | Avoid aliasing CodedInputStream::buffer_ when parsing little endian integers
* | | | | Improve support for plugin parameters.Gravatar Thomas Van Lenten2017-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --[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-1Gravatar Feng Xiao2017-02-13
|\ \ \ \ \ | | | | | | | | | | | | Undef TYPE_BOOL to avoid conflict with iOS.
* \ \ \ \ \ Merge pull request #2701 from anandolee/masterGravatar Jie Luo2017-02-13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add csharp compatibility tests against v3.0.0
* \ \ \ \ \ \ Merge pull request #2451 from podsvirov/json-primitive-mapGravatar Feng Xiao2017-02-13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | JsonUtilTest: Add ParsePrimitiveMapIn subtest
* \ \ \ \ \ \ \ Merge pull request #2704 from liutikas/masterGravatar Feng Xiao2017-02-13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix compiler warnings about unused variables in wire_format.h
* | | | | | | | | Add clear method to PHP message (#2700)Gravatar Paul Yang2017-02-11
| | | | | | | | |
| | * | | | | | | JsonUtilTest: Add ParsePrimitiveMapIn subtestGravatar Konstantin Podsvirov2017-02-11
| | | | | | | | |
| * | | | | | | | Fix compiler warnings about unused variables in wire_format.hGravatar Aurimas Liutikas2017-02-10
|/ / / / / / / /