AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
4,418 Commits 35 Branches 138 Tags 124 MiB
1b0db1cb83
Commit Graph

4418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Haberman
1b0db1cb83 Removed obsolete comments and added docs. 2017-03-16 15:19:09 -07:00
Josh Haberman
95b4427d39 Build system fixes for JS conformance tests. 2017-03-14 12:45:57 -07:00
Josh Haberman
8df69f0894 Conformance test for JS now work, though 15 tests fail. 2017-03-13 15:10:53 -07:00
Josh Haberman
f873d3213c Added JavaScript conformance tests. All tests pass! 2017-03-06 10:42:27 -08:00
Josh Haberman
27b1f2b477 WIP. 2017-03-06 10:42:27 -08:00
Adam Cozzette
008ff033ef Merge pull request #2784 from acozzette/log-2-floor-int 
Return uint32 from Log2FloorNonZero64
 2017-03-03 07:06:15 -08:00
Feng Xiao
8610d0a9dd Merge pull request #2755 from xfxyjwf/rubycomp 
Add Ruby compatibilty test against 3.0.0.
 2017-03-02 14:33:02 -08:00
Thomas Van Lenten
352526c214 Merge pull request #2785 from thomasvl/threading_race 
Handing threading race resolving methods.
 2017-03-02 17:14:52 -05:00
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.
 2017-03-02 16:34:11 -05:00
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.
 2017-03-02 11:31:38 -08:00
Adam Cozzette
a7e3b0ab01 Merge pull request #2774 from acozzette/closure-builder 
Use closurebuilder.py in favor of calcdeps.py for compiling JavaScript
 2017-03-02 08:47:20 -08:00
Sergio Campamá
8b182cc455 Disable static analyzer for message semaphore creation (#2748) 
Disable static analyzer for message semaphore creation
 2017-03-01 14:00:56 -05:00
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
 2017-03-01 10:45:43 -08:00
Matt Hauck
25ecd559cc Change hint type to const void* (#2568) 
This is both more correct, and the build fails on AIX without it
 2017-03-01 10:43:28 -08:00
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.
 2017-03-01 10:39:48 -08:00
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.
 2017-03-01 07:43:11 -08:00
Adam Cozzette
7339fc04c4 Merge pull request #2674 from acozzette/js-test-cleanup 
Removed log statement from writer_test.js
 2017-03-01 07:11:33 -08:00
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.
 2017-02-28 13:49:56 -08:00
Jisi Liu
5274d6ee31 Merge pull request #2770 from xfxyjwf/fixcmake 
Remove the use of C++11 features.
 2017-02-28 10:57:41 -08:00
Feng Xiao
83b0cc9ba6 Merge pull request #2772 from sschuberth/master 
Fix links to the license in meta-data
 2017-02-28 10:52:02 -08:00
Jie Luo
606cb7ed2c There might be duplicated enum values when allow_alias is true. Add PreferredAlias into OriginalNameAttribute to remove the duplication (#2727) 2017-02-28 10:51:19 -08:00
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
Feng Xiao
ffde972ac7 Remove the use of C++11 features. 2017-02-27 18:01:07 -08:00
Feng Xiao
9118ad659b Add Ruby compatibilty test against 3.0.0. 2017-02-27 17:38:54 -08: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