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

2292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Skeet
3e7d70cb69 Generated code changes due to map changes. 
(Primarily this is starting the hash code of messages at a non-zero value...)
 2015-06-25 12:08:55 +01:00
Jon Skeet
df44ae4413 More map tests, and various production code improvements. 
Generated code in next commit.
 2015-06-25 12:08:18 +01:00
Jon Skeet
e36e601a39 Generated map code. 2015-06-25 09:39:29 +01:00
Jon Skeet
0d684d3420 First pass at map support. 
More tests required. Generated code in next commit.
 2015-06-25 09:39:28 +01:00
Jon Skeet
0698aa9737 Get the Mono build script working again. 
The solution as a whole doesn't build yet - we probably want to remove
ProtoDump and ProtoMunge entirely, and ProtoBench should use Jan's new
benchmarks for parity with Java.

The version of NUnit on my machine, packaged with Mono 3.12.1, is
only NUnit 2.4.2, which is extremely old - it still requires an explicit
[TestFixture] attribute on test fixtures. I've added one just for ByteStringTest
for the moment so that we can see some tests passing in Travis, but as part of
a separate PR we should work on making sure we're using a recent NUnit version.
(It may already be doing so, but we can check that once it's working and merged.)
 2015-06-25 08:59:35 +01:00
Jon Skeet
d487c322de Regenerated descriptor C++ code 2015-06-25 08:22:56 +01:00
Jon Skeet
322ec53161 Revert the change to wire_format.h. 
It seems too much code relies on the broken behaviour. See issue #493.
Instead, we reimplement MakeTag just for C#, temporarily.
 2015-06-24 17:56:22 +01:00
Jon Skeet
bfee2dfe13 Implement freezing for messages and repeated fields. 
Fixes issue #523.
 2015-06-24 17:56:22 +01:00
Jon Skeet
94071b54d2 Merge pull request #536 from jtattermusch/fix_appveyor 
Integrate changes from upstream/master
 2015-06-24 17:42:07 +01:00
Jan Tattermusch
fbd735c5d7 Merge remote-tracking branch 'upstream/master' into fix_appveyor 2015-06-24 09:00:09 -07:00
Jan Tattermusch
659a43b593 Merge pull request #532 from jskeet/proto3-clone 
Implement Clone.
 2015-06-23 12:09:21 -07:00
Jon Skeet
785e13e3c0 Generated code changes from previous commit. 2015-06-23 20:05:04 +01:00
Jon Skeet
8c896b259e Implement requested changes for IMessage<T> 
1) New line at end of file
2) Make IMessage<T> itself extend IEquatable<T> and IDeepCloneable<T>
 2015-06-23 20:04:39 +01:00
Joshua Haberman
242fdef65a Merge pull request #530 from haberman/updateupb 
Update upb to fix two bugs in the Ruby library.
 2015-06-23 11:31:02 -07:00
Jon Skeet
6c1fe6ea3e Implement Clone. 
Fixes issue #527.
 2015-06-23 12:42:20 +01:00
Josh Haberman
fb8ed707a2 Update upb to fix two bugs in the Ruby library. 
Fixes:
  https://github.com/google/protobuf/issues/502
  https://github.com/google/protobuf/issues/425
 2015-06-22 17:23:55 -07:00
Feng Xiao
d0eb7786a9 Fix appveyor tests. 2015-06-22 15:09:52 -07:00
Paul Yang
d3d66d7976 Merge pull request #503 from thomasvl/add_nonnill_markup 
Add nonnull/nullable/null_resettable markup to ObjC library.
 2015-06-19 15:58:31 -07:00
Jan Tattermusch
45b70328f2 Merge pull request #515 from jskeet/proto3-only 
Proto3 experimental C# fork
 2015-06-19 12:59:07 -07:00
Jon Skeet
50a3a809e8 Merge remote-tracking branch 'upstream/master' into proto3-only 2015-06-19 17:35:01 +01:00
Jon Skeet
8e9dd12b3a Update the readme to give more context of what's going on. 2015-06-19 17:33:20 +01:00
Jon Skeet
cdeda4b876 Minor cleanup. 
- Make some members internal
- Remove a lot of FrameworkPortability that isn't required
- Start adding documentation comments
- Remove some more group-based members
- Not passing in "the last tag read" into Read*Array, g
 2015-06-19 17:30:13 +01:00
Jon Skeet
d7dda2fed8 Use an empty array instead of a null reference for an empty repeated field. 2015-06-19 08:38:21 +01:00
Jisi Liu
5b3a8e7635 Merge pull request #510 from pherl/bazel 
Remove OUTS constants in BUILD
 2015-06-18 14:13:56 -07:00
Jisi Liu
94062398dc Remove OUTS constants in BUILD 
Induce those from the input proto file names instead to reduce the
lenght of the BUILD file.

Change-Id: I1dda57dedac547f4bd0cc3a7d08fb611d72acd13
 2015-06-18 14:06:26 -07:00
Jisi Liu
89834be92e Merge pull request #509 from pherl/update_BUILD 
Update BUILD for the recent json util change.
 2015-06-18 13:54:47 -07:00
Jisi Liu
af3eafd1b1 Update BUILD for the recent json util change. 
Change-Id: I0b5a2c017f5412aaca3a47815671753cdef63165
 2015-06-18 13:39:09 -07:00
Jisi Liu
d6286a9f41 Merge pull request #508 from pherl/nanfix 
using ::isnan to avoid conflicts with std::isnan for C++11 build.
 2015-06-18 13:38:07 -07:00
Jisi Liu
a2b7937777 using ::isnan to avoid conflicts with std::isnan for C++11 build. 
Change-Id: I057b44eff04c3b0062a4fd4307ce6e4ca1eb952b
 2015-06-18 13:35:24 -07:00
Jisi Liu
e6484d306d Fix distcheck. 
Change-Id: I74e2d5958b5e7b15d10e5a6468bca917323b9739
 2015-06-18 11:24:07 -07:00
Jisi Liu
1e534d7ac3 Merge pull request #505 from pherl/bazel 
Add bazel support for the project
 2015-06-18 11:19:34 -07:00
Jisi Liu
e438a51389 Remove redundant include 
Change-Id: I62640af99e3c2650a29dc5468ce3deb7b6c7efdf
 2015-06-18 10:52:07 -07:00
Jisi Liu
d19604fac5 Add Bazel BUILD for the project. 
Change-Id: I5a299d969ff96d7d2f80aadc7e8987d461d24b8f
 2015-06-17 17:37:58 -07:00
Jisi Liu
1c42a8b336 Move cmake/update_file_lists.sh preparing for bazel support. 
Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654
 2015-06-17 13:31:26 -07:00
Feng Xiao
e9a122eb19 Merge pull request #501 from xfxyjwf/down 
Down-integrate from internal code base.
 2015-06-17 13:12:11 -07:00
Feng Xiao
818c5eee08 Fix broken builds. 2015-06-17 11:19:46 -07:00
Jon Skeet
a0f956932d Use our "local" copy of Encoding.UTF8 in CodedInputStream too. 2015-06-17 15:34:29 +01:00
Jon Skeet
a09b491080 Delete "lite" project and serialization project+code 
We'll probably want a lot of the code from the serialization project when we do JSON, but enough of it will change that it's not worth keeping in a broken state for now.
 2015-06-17 15:25:15 +01:00
Jon Skeet
d1b88f4310 Regenerated files. 2015-06-17 15:16:31 +01:00
Jon Skeet
09f3f4eec3 Updates to handle use of cmake for Windows builds. 2015-06-17 15:16:14 +01:00
Jon Skeet
e2acd85425 Merged master 2015-06-17 15:03:47 +01:00
Jon Skeet
d9dc05e500 Remove a lot of projects which are effectively dead from the solution - files to be killed later. 2015-06-17 14:59:49 +01:00
Jon Skeet
828b7e61d0 Use the fact that we know the tag size and bytes at codegen time to optimize. 2015-06-17 14:59:10 +01:00
Jisi Liu
b36395b2ba Merge pull request #497 from pherl/config_h 
Check HAVE_CONFIG_H before including "config.h"
 2015-06-16 19:12:25 -07:00
Jisi Liu
78d470c7a5 Make the code independent of config.h 
Now the Build tool needs to define -DHAVE_ZLIB and -DHAVE-PTHREAD rather
than providing a config.h

- Make pbconfig.h a manually written file to handle hash conditions
  according to platform related macros.
- Remove #include "config.h" from source code.
- Changed the configure.ac and Makefile.am to pass down the macros.
- Change cmake to pass down the the macros.

Change-Id: I537249d5df8fdeba189706aec436d1ab1104a4dc
 2015-06-16 18:27:36 -07:00
Thomas Van Lenten
8c88957ef3 Add nonnil markup to ObjC library. 
Add the clang annotations to the objc library and generated code to help with Swift bridging and compiler checks.
 2015-06-16 17:04:50 -04:00
Feng Xiao
e96ff30120 Down-integrate from internal code base. 
[ci skip]

Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
 2015-06-15 18:24:01 -07:00
Feng Xiao
4cbb612299 Merge pull request #499 from xfxyjwf/appveyor 
Add a badge for AppVeyor build.
 2015-06-15 16:31:31 -07:00
Feng Xiao
4479076bbd Merge pull request #488 from AustinSchuh/ruby_test_fix 
Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUF
 2015-06-15 16:31:17 -07:00
Feng Xiao
9c8db515d5 Add a badge for AppVeyor build. 
Change-Id: Ic59d78d699af0e5f50377f83c8a7ea9a78074d81
 2015-06-15 15:36:09 -07:00