aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Handing threading race resolving methods.Thomas Van Lenten2017-03-024-9/+46
| | | | | | | - 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-builderAdam Cozzette2017-03-024-3/+32
|\ | | | | Use closurebuilder.py in favor of calcdeps.py for compiling JavaScript
| * Use closurebuilder.py in favor of calcdeps.py for compiling JavaScriptAdam Cozzette2017-03-014-3/+32
| | | | | | | | | | | | | | | | | | | | 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.
* | Disable static analyzer for message semaphore creation (#2748)Sergio Campamá2017-03-011-0/+8
| | | | | | | | Disable static analyzer for message semaphore creation
* | Fix gcc 4.1 build (#1035) (#1913)Matt Hauck2017-03-013-19/+31
| | | | | | | | | | | | | | | | | | | | * 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)Matt Hauck2017-03-011-1/+1
| | | | | | This is both more correct, and the build fails on AIX without it
* | Add mergeFrom method on Message (#2766)Paul Yang2017-03-0111-7/+439
|/ | | | | | | | 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.
* Merge pull request #2674 from acozzette/js-test-cleanupAdam Cozzette2017-03-011-2/+0
|\ | | | | Removed log statement from writer_test.js
| * Removed log statement from writer_test.jsAdam Cozzette2017-02-281-2/+0
|/ | | | | 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/fixcmakeJisi Liu2017-02-2814-410/+410
|\ | | | | Remove the use of C++11 features.
| * Remove the use of C++11 features.Feng Xiao2017-02-2714-410/+410
| |
* | Merge pull request #2772 from sschuberth/masterFeng Xiao2017-02-289-15/+15
|\ \ | | | | | | Fix links to the license in meta-data
| * | Prefer the term "3-Clause BSD License" over "New BSD License"Sebastian Schuberth2017-02-289-11/+11
| | | | | | | | | | | | The first is the newer name, which is also more telling.
| * | Fix links to the New BSD License in meta-dataSebastian Schuberth2017-02-285-7/+7
| | | | | | | | | | | | | | | The "New BSD License" is the "3-Clause BSD License", but the links were pointing to the "2-Clause BSD License".
* | | There might be duplicated enum values when allow_alias is true. Add ↵Jie Luo2017-02-286-94/+250
|/ / | | | | | | PreferredAlias into OriginalNameAttribute to remove the duplication (#2727)
* | Merge pull request #2733 from wmamrak/patch-1Adam Cozzette2017-02-271-1/+1
|\ \ | | | | | | Disable MSVC warning C4309
| * | Disable MSVC warning C4309Wojciech Mamrak2017-02-181-1/+1
| | | | | | | | | | | | | | | > warning C4309: static_cast': truncation of constant value introduced in commit 9db5b11c9cf2922435b53495b9c1e114525f0428
* | | Merge pull request #2729 from MarcelRaad/fix_inline_msvc12Adam Cozzette2017-02-271-6/+6
|\ \ \ | |_|/ |/| | Fix unresolved symbols with MSVC12 and /Zc:inline
| * | Fix unresolved symbols with MSVC12 and /Zc:inlineMarcel Raad2017-02-171-6/+6
| |/ | | | | | | | | | | | | 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 #2355 from xfxyjwf/fixjsonFeng Xiao2017-02-242-14/+20
|\ \ | | | | | | Speed up JSON parsing.
| * | Speed up JSON parsing.Feng Xiao2016-11-102-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #2732 from AsturaPhoenix/masterAdam Cozzette2017-02-241-1/+1
|\ \ \ | | | | | | | | const FieldDescriptorCompare
| * | | const FieldDescriptorCompareRoss Wang2017-02-171-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | 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
* | | Merge pull request #2747 from liutikas/masterAdam Cozzette2017-02-241-0/+2
|\ \ \ | | | | | | | | Fix unused variables warnings in generated_message_reflection.h
| * | | Fix compiler warnings about unused variables in generated_message_reflection.hAurimas Liutikas2017-02-221-0/+2
| | | |
* | | | Merge pull request #2734 from msabramo/patch-1Adam Cozzette2017-02-241-1/+1
|\ \ \ \ | | | | | | | | | | README.md: Make docs URL a link
| * | | | README.md: Make docs URL a linkMarc Abramowitz2017-02-181-1/+1
| | |/ / | |/| | | | | | Dedent URL so it renders as a link and not as code (fixed width font and not clickable).
* | | | Merge pull request #2630 from blodan/masterJisi Liu2017-02-241-1/+1
|\ \ \ \ | | | | | | | | | | FreeBSD compatibility
| * | | | FreeBSD compatibilityDaniel Ylitalo2017-01-251-1/+1
| | | | |
* | | | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 00:41:49 +0000