aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | |
| * | | | | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 03:27:00 +0000