Thomas Van Lenten
352526c214
Merge pull request #2785 from thomasvl/threading_race
...
Handing threading race resolving methods.
8 years ago
Thomas Van Lenten
2d1c5e26cb
Handing threading race resolving methods.
...
- 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.
8 years ago
Adam Cozzette
938206d66c
Return uint32 from Log2FloorNonZero64
...
A uint32 is big enough to hold any return value from that function, and
doing it this way prevents compiler warnings in coded_stream.h about
narrowing a uint64 to a uint32.
8 years ago
Adam Cozzette
a7e3b0ab01
Merge pull request #2774 from acozzette/closure-builder
...
Use closurebuilder.py in favor of calcdeps.py for compiling JavaScript
8 years ago
Sergio Campamá
8b182cc455
Disable static analyzer for message semaphore creation ( #2748 )
...
Disable static analyzer for message semaphore creation
8 years ago
Matt Hauck
6011d7ca4c
Fix gcc 4.1 build ( #1035 ) ( #1913 )
...
* 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
8 years ago
Matt Hauck
25ecd559cc
Change hint type to `const void*` ( #2568 )
...
This is both more correct, and the build fails on AIX without it
8 years ago
Paul Yang
bcbaabe53a
Add mergeFrom method on Message ( #2766 )
...
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.
8 years ago
Adam Cozzette
671e075c5e
Use closurebuilder.py in favor of calcdeps.py for compiling JavaScript
...
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.
8 years ago
Adam Cozzette
7339fc04c4
Merge pull request #2674 from acozzette/js-test-cleanup
...
Removed log statement from writer_test.js
8 years ago
Feng Xiao
b7f25d42d3
Undef major/minor if they are defined as macro.
8 years ago
Adam Cozzette
aff9d9d39c
Removed log statement from writer_test.js
...
This tweak makes the test output a bit easier to read because it cuts
out a lot of unnecessary logging.
8 years ago
Jisi Liu
5274d6ee31
Merge pull request #2770 from xfxyjwf/fixcmake
...
Remove the use of C++11 features.
8 years ago
Feng Xiao
83b0cc9ba6
Merge pull request #2772 from sschuberth/master
...
Fix links to the license in meta-data
8 years ago
Jie Luo
606cb7ed2c
There might be duplicated enum values when allow_alias is true. Add PreferredAlias into OriginalNameAttribute to remove the duplication ( #2727 )
8 years ago
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.
8 years ago
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".
8 years ago
Feng Xiao
ffde972ac7
Remove the use of C++11 features.
8 years ago
Feng Xiao
9118ad659b
Add Ruby compatibilty test against 3.0.0.
8 years ago
Adam Cozzette
d41c47fff9
Merge pull request #2733 from wmamrak/patch-1
...
Disable MSVC warning C4309
8 years ago
Adam Cozzette
8d61f9c3bf
Merge pull request #2729 from MarcelRaad/fix_inline_msvc12
...
Fix unresolved symbols with MSVC12 and /Zc:inline
8 years ago
Feng Xiao
b4b0e304be
Merge pull request #2355 from xfxyjwf/fixjson
...
Speed up JSON parsing.
8 years ago
Adam Cozzette
8387b88cdc
Merge pull request #2732 from AsturaPhoenix/master
...
const FieldDescriptorCompare
8 years ago
Adam Cozzette
66c64e7045
Merge pull request #2747 from liutikas/master
...
Fix unused variables warnings in generated_message_reflection.h
8 years ago
Adam Cozzette
8c8b8e61f2
Merge pull request #2734 from msabramo/patch-1
...
README.md: Make docs URL a link
8 years ago
Jisi Liu
72b82e6875
Merge pull request #2630 from blodan/master
...
FreeBSD compatibility
8 years ago
Thomas Van Lenten
963473b1dd
Merge pull request #2753 from thomasvl/recursive_drop
...
Add GPBMessageDropUnknownFieldsRecursively() and tests.
8 years ago
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).
8 years ago
Manjunath Kudlur
2d430f8c72
Added a header only cc_library target for the protobuf library.
8 years ago
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
8 years ago
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
8 years ago
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.
8 years ago
Aurimas Liutikas
a434bfc232
Fix compiler warnings about unused variables in generated_message_reflection.h
8 years ago
Feng Xiao
1a8cbfd355
Merge pull request #2736 from na-ka-na/master3
...
Add an option to always print enums as ints in Json API
8 years ago
Sanchay Harneja
172e0a6423
Add an option to always print enums as ints in Json API
...
https://github.com/google/protobuf/issues/2735
8 years ago
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).
8 years ago
Wojciech Mamrak
37bd5d525b
Disable MSVC warning C4309
...
> warning C4309: static_cast': truncation of constant value
introduced in commit 9db5b11c9c
8 years ago
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
8 years ago
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.
8 years ago
Adam Cozzette
a9ab38c171
Merge pull request #2722 from ckennelly/unified
...
Merge #2653 , #2622 , #2579 , #2652
8 years ago
Chris Kennelly
8af35f28f6
Keep loop bounds in a local variable for string fields.
8 years ago
Chris Kennelly
a6c30d9705
Keep loop bounds in a local variable.
8 years ago
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.
8 years ago
Chris Kennelly
0026dff9f6
Expose rvalue setters for repeated string fields.
...
rvalue setters for scalar string fields were added in #2506 .
8 years ago
Adam Cozzette
38b14408c5
Merge pull request #2663 from ckennelly/varint-size
...
Inline branch-less VarintSize32/VarintSize64 implementations.
8 years ago
Adam Cozzette
15360e59cf
Merge pull request #2689 from ckennelly/aliasing-fixed32-fixed64
...
Avoid aliasing CodedInputStream::buffer_ when parsing little endian integers
8 years ago
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
8 years ago
Feng Xiao
d2dfe46b27
Merge pull request #2609 from yixiang/patch-1
...
Undef TYPE_BOOL to avoid conflict with iOS.
8 years ago
Jie Luo
3f6f73b796
Merge pull request #2701 from anandolee/master
...
Add csharp compatibility tests against v3.0.0
8 years ago
Feng Xiao
ed423c2c52
Merge pull request #2451 from podsvirov/json-primitive-map
...
JsonUtilTest: Add ParsePrimitiveMapIn subtest
8 years ago