Commit Graph

4395 Commits

Author SHA1 Message Date
Sebastian Schuberth
902af0816e Prefer the term "3-Clause BSD License" over "New BSD License"
The first is the newer name, which is also more telling.
2017-02-28 09:58:24 +01:00
Sebastian Schuberth
6395a1cbd9 Fix links to the New BSD License in meta-data
The "New BSD License" is the "3-Clause BSD License", but the links were
pointing to the "2-Clause BSD License".
2017-02-28 09:54:21 +01:00
Adam Cozzette
d41c47fff9 Merge pull request #2733 from wmamrak/patch-1
Disable MSVC warning C4309
2017-02-27 08:50:32 -08:00
Adam Cozzette
8d61f9c3bf Merge pull request #2729 from MarcelRaad/fix_inline_msvc12
Fix unresolved symbols with MSVC12 and /Zc:inline
2017-02-27 08:29:10 -08:00
Feng Xiao
b4b0e304be Merge pull request #2355 from xfxyjwf/fixjson
Speed up JSON parsing.
2017-02-24 15:41:09 -08:00
Adam Cozzette
8387b88cdc Merge pull request #2732 from AsturaPhoenix/master
const FieldDescriptorCompare
2017-02-24 14:44:17 -08:00
Adam Cozzette
66c64e7045 Merge pull request #2747 from liutikas/master
Fix unused variables warnings in generated_message_reflection.h
2017-02-24 14:43:14 -08:00
Adam Cozzette
8c8b8e61f2 Merge pull request #2734 from msabramo/patch-1
README.md: Make docs URL a link
2017-02-24 14:24:02 -08:00
Jisi Liu
72b82e6875 Merge pull request #2630 from blodan/master
FreeBSD compatibility
2017-02-24 12:52:53 -08:00
Thomas Van Lenten
963473b1dd Merge pull request #2753 from thomasvl/recursive_drop
Add GPBMessageDropUnknownFieldsRecursively() and tests.
2017-02-23 15:18:17 -05:00
Thomas Van Lenten
d07176654b Add GPBMessageDropUnknownFieldsRecursively() and tests.
GPBMessageDropUnknownFieldsRecursively() is a new helper to drop the
unknownFields from a message and all sub messages (in fields or extensions).
2017-02-23 15:04:06 -05:00
John Brock
17174b54dd Updating README
- Adding more detail on running tests
- Adding info about the status of .NET 3.5 support and how to enable .NET 3.5
2017-02-23 10:51:52 +00:00
John Brock
f83d129555 Upgrading test-related libraries
NUnit 3.4.0 —> 3.6.0
dotnet-test-nunit 3.4.0-alpha-2 —> 3.4.0-beta-3
2017-02-23 10:51:52 +00:00
John Brock
c9b2c8f327 Fixes for .NET 3.5 compatibility
* 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.
2017-02-23 10:51:52 +00:00
Aurimas Liutikas
a434bfc232 Fix compiler warnings about unused variables in generated_message_reflection.h 2017-02-22 14:14:13 -08:00
Feng Xiao
1a8cbfd355 Merge pull request #2736 from na-ka-na/master3
Add an option to always print enums as ints in Json API
2017-02-21 11:08:05 -08:00
Sanchay Harneja
172e0a6423 Add an option to always print enums as ints in Json API
https://github.com/google/protobuf/issues/2735
2017-02-18 17:06:43 -08:00
Marc Abramowitz
86208c526b README.md: Make docs URL a link
Dedent URL so it renders as a link and not as code (fixed width font and not clickable).
2017-02-18 13:05:19 -08:00
Wojciech Mamrak
37bd5d525b Disable MSVC warning C4309
> warning C4309: static_cast': truncation of constant value

introduced in commit 9db5b11c9c
2017-02-18 15:44:29 +01:00
Ross Wang
01a05a53f4 const FieldDescriptorCompare
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
2017-02-17 15:48:08 -08:00
Marcel Raad
8f9c0a44bd
Fix unresolved symbols with MSVC12 and /Zc:inline
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.
2017-02-17 12:13:08 +01:00
Adam Cozzette
a9ab38c171 Merge pull request #2722 from ckennelly/unified
Merge #2653, #2622, #2579, #2652
2017-02-16 13:42:17 -08:00
Chris Kennelly
8af35f28f6 Keep loop bounds in a local variable for string fields. 2017-02-15 11:41:46 -08:00
Chris Kennelly
a6c30d9705 Keep loop bounds in a local variable. 2017-02-15 11:40:27 -08:00
Chris Kennelly
9db5b11c9c Work with truncated tag numbers.
This allows more compact comparisons (1 byte instead of 4 byte
immediates on x86) for each possible wire/tag inside each field.
2017-02-15 11:39:39 -08:00
Chris Kennelly
0026dff9f6 Expose rvalue setters for repeated string fields.
rvalue setters for scalar string fields were added in #2506.
2017-02-15 11:35:24 -08:00
Adam Cozzette
38b14408c5 Merge pull request #2663 from ckennelly/varint-size
Inline branch-less VarintSize32/VarintSize64 implementations.
2017-02-15 10:44:58 -08:00
Adam Cozzette
15360e59cf Merge pull request #2689 from ckennelly/aliasing-fixed32-fixed64
Avoid aliasing CodedInputStream::buffer_ when parsing little endian integers
2017-02-14 15:11:47 -08:00
Thomas Van Lenten
38c238e35e Improve support for plugin parameters.
--[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
2017-02-14 14:04:29 -05:00
Feng Xiao
d2dfe46b27 Merge pull request #2609 from yixiang/patch-1
Undef TYPE_BOOL to avoid conflict with iOS.
2017-02-13 17:03:55 -08:00
Jie Luo
3f6f73b796 Merge pull request #2701 from anandolee/master
Add csharp compatibility tests against v3.0.0
2017-02-13 10:54:34 -08:00
Feng Xiao
ed423c2c52 Merge pull request #2451 from podsvirov/json-primitive-map
JsonUtilTest: Add ParsePrimitiveMapIn subtest
2017-02-13 10:46:40 -08:00
Feng Xiao
aa78aeba98 Merge pull request #2704 from liutikas/master
Fix compiler warnings about unused variables in wire_format.h
2017-02-13 10:26:09 -08:00
Paul Yang
74eb9a0a30 Add clear method to PHP message (#2700) 2017-02-11 16:36:17 -08:00
Konstantin Podsvirov
46c022a0a9 JsonUtilTest: Add ParsePrimitiveMapIn subtest 2017-02-11 03:39:53 +03:00
Aurimas Liutikas
9079079ec0 Fix compiler warnings about unused variables in wire_format.h 2017-02-10 16:23:49 -08:00
Jonathan Hseu
ef927cc428 Switch to gcc atomic intrinsics for macOS and delete the file that uses (#2699)
the deprecated atomics.
2017-02-10 14:55:34 -08:00
Jie Luo
7288689d8c Add csharp compatibility tests against v3.0.0 and run on Travis. 2017-02-10 13:40:16 -08:00
Feng Xiao
1d2736f24d Merge pull request #2656 from pcj/patch-1
Add bazel protobuf resources
2017-02-10 10:47:48 -08:00
Jie Luo
9f09d1804a Add proto and test files for csharp compatibility tests against v3.0.0.
All the files are copied from 3.0.0 (JosnFormaterTest was deleted)
2017-02-09 16:43:18 -08:00
Jie Luo
c6e0d0e7f3 Merge pull request #2647 from anandolee/master
Fix python compatibility test
2017-02-09 16:32:08 -08:00
Jie Luo
42e1e2abef Fix python compatibility test when a new generated code imports an old version(2.6.1 or older) generated code. 2017-02-09 11:08:10 -08:00
Feng Xiao
e844510f44 Merge pull request #2692 from cgrushko/patch-3
Update load() statement to latest style
2017-02-08 13:02:18 -08:00
cgrushko
65a4d20deb Update load() statement to latest style
The first argument is currently implicitly a .bzl file.
Change this to be explicit.
2017-02-08 15:23:57 -05:00
Feng Xiao
a60cc08d83 Merge pull request #2691 from cgrushko/patch-3
Bazel can build protobuf when it's not in the root
2017-02-08 10:45:47 -08:00
Paul Yang
cba04b19e8 Implement json encoding decoding for php. (#2682) 2017-02-08 10:27:54 -08:00
cgrushko
6fffd4adb4 Bazel can build protobuf when it's not in the root
That is, Bazel can now build protobuf when the latter resides in a subdirectory of a project.
2017-02-08 12:19:40 -05:00
Chris Kennelly
56da82820e Avoid aliasing CodedInputStream::buffer_ when parsing little endian integers.
This eliminates an unnecessary reload of buffer_ that occurs (before
this change) after the store to *value.
2017-02-07 17:41:16 -08:00
Paul Yang
c00274313d Add fixed version to phpunit used in travis (#2673) 2017-02-07 10:55:48 -08:00
Thomas Van Lenten
36f51f963c Merge pull request #2681 from sergiocampama/spaces
Removes trailing whitespaces
2017-02-07 11:59:59 -05:00