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

2523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Skeet
2ee4b56655 Merge pull request #629 from google/master 
Integrate changes from upstream/master into csharp-experimental
 2015-07-21 12:58:43 +01:00
Jan Tattermusch
c792db5d08 Merge pull request #628 from jtattermusch/csharp_addressbook_update 
C# addressbook update
 2015-07-20 18:54:34 -07:00
Jan Tattermusch
353b7a9985 Merge pull request #627 from jtattermusch/addressbook_proto3 
Update addressbook.proto and examples code to proto3
 2015-07-20 18:54:27 -07:00
Jisi Liu
d119a27549 Merge pull request #621 from nico/staticass 
Let GOOGLE_COMPILE_ASSERT use static_assert if available.
 2015-07-20 17:36:00 -07:00
Jan Tattermusch
43b17376f7 update addressbook example 2015-07-20 16:00:26 -07:00
Jan Tattermusch
352690efc7 regenerate Addressbook.cs 2015-07-20 15:53:19 -07:00
Jan Tattermusch
792ae21bde update addressbook.proto 2015-07-20 15:51:07 -07:00
Jan Tattermusch
b0e5ba697e rename persons to people 2015-07-20 15:24:08 -07:00
Jan Tattermusch
359d32d4f7 use Google.Protobuf namespace for C# 2015-07-20 15:12:56 -07:00
Jan Tattermusch
4d86c2b495 fixed java example 2015-07-20 14:51:09 -07:00
Jan Tattermusch
b95670f5fb fix python example 2015-07-20 14:34:27 -07:00
Jan Tattermusch
78709f20fb fix C++ example 2015-07-20 14:33:36 -07:00
Jan Tattermusch
69c14071ad update addressbook.proto to proto3 2015-07-20 14:32:57 -07:00
Joshua Haberman
aba42edd8c Merge pull request #604 from haberman/ruby-conformance 
Added Ruby to conformance tests.
 2015-07-20 11:06:17 -07:00
Jan Tattermusch
bd3367c8b4 Merge pull request #624 from jskeet/wkt-json 
First part of JSON formatting for well-known types.
 2015-07-20 09:36:54 -07:00
Jon Skeet
c9fd53a3b7 First part of JSON formatting for well-known types. I think we need a reflection API rethink before doing the rest. 2015-07-20 11:48:24 +01:00
Josh Haberman
c2c43a4917 Fixed lint errors and responded to CR comments. 
Change-Id: If7b1cc0f03f609a7f43ddafc8509b44207c60910
 2015-07-17 16:29:10 -07:00
Josh Haberman
95ee8fb88e Exclude JRuby from conformance tests for now. 
Change-Id: Id008ebac5159f773e1bde8b85acb2626cbd16de8
 2015-07-17 16:20:01 -07:00
Jisi Liu
58035596e7 Merge pull request #622 from pherl/splitheaders 
Addming missing includes in stubs headers.
 2015-07-17 15:40:42 -07:00
Jisi Liu
51053120db Addming missing includes in stubs headers. 
This is to prepare removing those additional headers in common.h

Change-Id: I707d6d8eaf193eb28195a827c7fec738b968ab3e
 2015-07-17 15:40:03 -07:00
Nico Weber
56a90a2081 Let GOOGLE_COMPILE_ASSERT use static_assert if available. 
The motivation is that gcc 4.8+ and clang trunk warn on unused local
typedefs, which COMPILE_ASSERT adds. After this change, the warning
will be happy at least in C++11 builds. static_assert also produces a
slighly nicer diagnostic than the typedef method.

eb93e8bc43
did the same change in re2.
 2015-07-17 14:18:36 -07:00
Jisi Liu
798ed10e7a Merge pull request #613 from pherl/splitheaders 
Split up common.h headers
 2015-07-17 13:57:59 -07:00
Jie Luo
7648852550 Merge pull request #601 from anandolee/master 
ignore UTF-8 BOM
 2015-07-17 13:23:29 -07:00
Jon Skeet
3f5df7a74b Merge pull request #620 from google/jtattermusch-patch-2 
Fix typo in buildall.sh
 2015-07-17 20:20:41 +01:00
Jan Tattermusch
9b28d4b12c Fix typo in buildall.sh 2015-07-17 12:19:20 -07:00
Jisi Liu
12f6e3dd0e update header list. 
Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64
 2015-07-17 11:36:51 -07:00
Jisi Liu
4dde2a87a9 Merge branch 'master' of github.com:google/protobuf into splitheader 
Change-Id: I5f6cbc2430200e3751ad754cc7ae604338db6f91
 2015-07-17 11:36:29 -07:00
Jisi Liu
7b216119ee Update make file for extra headers. 
Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
 2015-07-17 11:34:33 -07:00
Jan Tattermusch
4e354c7028 Merge pull request #616 from jskeet/rename 
First pass at the big rename from ProtocolBuffers to Google.Protobuf.
 2015-07-17 10:37:45 -07:00
Jon Skeet
86cf61d448 Updated csharp_EXTRA_DIST for Travis 2015-07-17 10:14:29 +01:00
Jon Skeet
59eeebee87 First pass at the big rename from ProtocolBuffers to Google.Protobuf. 
We'll see what I've missed when CI fails...
 2015-07-17 08:26:04 +01:00
Jon Skeet
0f442a7533 Merge pull request #611 from jskeet/csharp-wrappers 
C# wrapper types
 2015-07-17 07:29:50 +01:00
Jon Skeet
34878cb14e Fixes from PR review. 2015-07-17 06:41:46 +01:00
Jan Tattermusch
fa544f4835 Merge pull request #586 from jtattermusch/csharp_names_export 
Export c# naming routines publicly
 2015-07-16 17:33:56 -07:00
Jisi Liu
4e694f7b23 Split up common.h headers 
Change-Id: I223783111d743aa5193bf70fa1b9b54c7b4389c3
 2015-07-16 16:49:38 -07:00
Jie Luo
ea7de1dadb Merge pull request #612 from jtattermusch/csharp_distcheck_fix 
Fix make distcheck
 2015-07-16 13:43:02 -07:00
Jon Skeet
3da90e9f54 Make the map test actually test the code... 2015-07-16 21:34:10 +01:00
Jan Tattermusch
a5cbf7061d Merge pull request #607 from jtattermusch/csharp_appveyor 
Run C# tests on Appveyor
 2015-07-16 12:27:29 -07:00
Josh Haberman
181c7f2636 Added Ruby to conformance tests. 
This involved fixing a few important bugs in the
Ruby implementation -- mostly cases of mixing
upb field types and descriptor types (upb field
types do not distinguish between int/sint/fixed/sfixed
like descriptor types do).

Also added protobuf-specific exceptions so parse
errors can be caught specifically.

Change-Id: Ib49d3db976900b2c6f3455c8b88af52cfb86e036
 2015-07-16 12:25:55 -07:00
Jie Luo
b2d2cf8b48 ignore UTF-8 BOM if it is in the begining of a proto file 2015-07-16 11:59:21 -07:00
Jan Tattermusch
271cba2871 updated csharp_EXTRA_DIST 2015-07-16 11:25:16 -07:00
Jon Skeet
8a0312b201 First pass at wrapper types. 
- We do still generate the message types, as otherwise reflection breaks, even though it doesn't actually use those types.
- JSON handling hasn't been implemented yet
 2015-07-16 17:03:06 +01:00
Jon Skeet
8d47ec4f3e Fixes to ByteString's equality handling. 2015-07-16 09:36:31 +01:00
Jon Skeet
b2ac868493 First part of implementing wrapper types. Not ready yet! 2015-07-16 09:36:30 +01:00
Jon Skeet
7ea5239792 Merge pull request #610 from jskeet/fix-enumerator 
Remove the struct-based iterator for RepeatedField.
 2015-07-16 09:34:04 +01:00
Jon Skeet
78b452b7ac Remove the struct-based iterator for RepeatedField. 
We don't use it in the runtime or generated code anywhere now, so the extra small performance boost isn't as critical, and it has some undesirable consequences.

The tests have needed to change as iterator block enumerators don't throw when we might expect them to.
 2015-07-16 09:26:10 +01:00
Jon Skeet
3bf74a91bb Merge pull request #605 from jtattermusch/csharp_cleanup 
Assorted nits from C# code.
 2015-07-16 08:08:45 +01:00
Jan Tattermusch
d4794c56b5 add C# build and tests to appveyor 2015-07-15 23:34:19 -07:00
Jan Tattermusch
b4a24aa5fa added comment for ByteString.CopyFrom 2015-07-15 23:29:45 -07:00
Jan Tattermusch
ab5fffcc9e C# cleanup - assorted nits 2015-07-15 23:29:45 -07:00