aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * First pass at map support.Jon Skeet2015-06-2520-10/+913
| | | | | | | | More tests required. Generated code in next commit.
* | Merge pull request #534 from jskeet/proto3-freezeJon Skeet2015-06-2532-312/+1695
|\| | | | | Implement Freeze in C# protos
| * Get the Mono build script working again.Jon Skeet2015-06-253-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.)
| * Regenerated descriptor C++ codeJon Skeet2015-06-251-3/+2
| |
| * Revert the change to wire_format.h.Jon Skeet2015-06-245-4/+16
| | | | | | | | | | It seems too much code relies on the broken behaviour. See issue #493. Instead, we reimplement MakeTag just for C#, temporarily.
| * Implement freezing for messages and repeated fields.Jon Skeet2015-06-2425-292/+1668
|/ | | | Fixes issue #523.
* Merge pull request #536 from jtattermusch/fix_appveyorJon Skeet2015-06-2433-295/+422
|\ | | | | Integrate changes from upstream/master
| * Merge remote-tracking branch 'upstream/master' into fix_appveyorJan Tattermusch2015-06-2433-295/+422
|/|
| * Merge pull request #530 from haberman/updateupbJoshua Haberman2015-06-232-19/+54
| |\ | | | | | | Update upb to fix two bugs in the Ruby library.
| | * Update upb to fix two bugs in the Ruby library.Josh Haberman2015-06-222-19/+54
| |/ | | | | | | | | | | Fixes: https://github.com/google/protobuf/issues/502 https://github.com/google/protobuf/issues/425
| * Fix appveyor tests.Feng Xiao2015-06-221-2/+2
| |
| * Merge pull request #503 from thomasvl/add_nonnill_markupPaul Yang2015-06-1930-274/+366
| |\ | | | | | | Add nonnull/nullable/null_resettable markup to ObjC library.
| | * Add nonnil markup to ObjC library.Thomas Van Lenten2015-06-1630-274/+366
| | | | | | | | | | | | Add the clang annotations to the objc library and generated code to help with Swift bridging and compiler checks.
* | | Merge pull request #532 from jskeet/proto3-cloneJan Tattermusch2015-06-2323-151/+991
|\ \ \ | | | | | | | | Implement Clone.
| * | | Generated code changes from previous commit.Jon Skeet2015-06-236-66/+66
| | | |
| * | | Implement requested changes for IMessage<T>Jon Skeet2015-06-232-5/+6
| | | | | | | | | | | | | | | | | | | | 1) New line at end of file 2) Make IMessage<T> itself extend IEquatable<T> and IDeepCloneable<T>
| * | | Implement Clone.Jon Skeet2015-06-2323-149/+988
|/ / / | | | | | | | | | Fixes issue #527.
* | | Merge pull request #515 from jskeet/proto3-onlyJan Tattermusch2015-06-19237-199324/+12288
|\ \ \ | |/ / |/| | Proto3 experimental C# fork
| * | Merge remote-tracking branch 'upstream/master' into proto3-onlyJon Skeet2015-06-19107-330/+28853
| |\ \ | |/ / |/| |
* | | Merge pull request #510 from pherl/bazelJisi Liu2015-06-182-95/+2
|\ \ \ | | | | | | | | Remove OUTS constants in BUILD
| * | | Remove OUTS constants in BUILDJisi Liu2015-06-182-95/+2
|/ / / | | | | | | | | | | | | | | | | | | Induce those from the input proto file names instead to reduce the lenght of the BUILD file. Change-Id: I1dda57dedac547f4bd0cc3a7d08fb611d72acd13
* | | Merge pull request #509 from pherl/update_BUILDJisi Liu2015-06-181-2/+65
|\ \ \ | | | | | | | | Update BUILD for the recent json util change.
| * | | Update BUILD for the recent json util change.Jisi Liu2015-06-181-2/+65
|/ / / | | | | | | | | | Change-Id: I0b5a2c017f5412aaca3a47815671753cdef63165
* | | Merge pull request #508 from pherl/nanfixJisi Liu2015-06-181-1/+1
|\ \ \ | | | | | | | | using ::isnan to avoid conflicts with std::isnan for C++11 build.
| * | | using ::isnan to avoid conflicts with std::isnan for C++11 build.Jisi Liu2015-06-181-1/+1
|/ / / | | | | | | | | | Change-Id: I057b44eff04c3b0062a4fd4307ce6e4ca1eb952b
* | | Fix distcheck.Jisi Liu2015-06-181-1/+1
| | | | | | | | | | | | Change-Id: I74e2d5958b5e7b15d10e5a6468bca917323b9739
* | | Merge pull request #505 from pherl/bazelJisi Liu2015-06-185-122/+593
|\ \ \ | | | | | | | | Add bazel support for the project
| * | | Remove redundant includeJisi Liu2015-06-181-1/+0
| | | | | | | | | | | | | | | | Change-Id: I62640af99e3c2650a29dc5468ce3deb7b6c7efdf
| * | | Add Bazel BUILD for the project.Jisi Liu2015-06-173-49/+524
| | | | | | | | | | | | | | | | Change-Id: I5a299d969ff96d7d2f80aadc7e8987d461d24b8f
| * | | Move cmake/update_file_lists.sh preparing for bazel support.Jisi Liu2015-06-172-6/+4
| | | | | | | | | | | | | | | | Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654
* | | | Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-17103-207/+28289
|\ \ \ \ | |/ / / |/| | | Down-integrate from internal code base.
| * | | Fix broken builds.Feng Xiao2015-06-1732-136/+190
| | | |
| * | | Down-integrate from internal code base.Feng Xiao2015-06-15101-198/+28226
| | |/ | |/| | | | | | | | | | | | | [ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
| | * Update the readme to give more context of what's going on.Jon Skeet2015-06-191-14/+15
| | |
| | * Minor cleanup.Jon Skeet2015-06-1918-254/+256
| | | | | | | | | | | | | | | | | | | | | | | | - 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
| | * Use an empty array instead of a null reference for an empty repeated field.Jon Skeet2015-06-191-22/+10
| | |
| | * Use our "local" copy of Encoding.UTF8 in CodedInputStream too.Jon Skeet2015-06-173-7/+8
| | |
| | * Delete "lite" project and serialization project+codeJon Skeet2015-06-1746-61270/+0
| | | | | | | | | | | | 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.
| | * Regenerated files.Jon Skeet2015-06-171-3/+3
| | |
| | * Updates to handle use of cmake for Windows builds.Jon Skeet2015-06-173-8/+5
| | |
| | * Merged masterJon Skeet2015-06-17159-16792/+13554
| | |\ | |_|/ |/| |
* | | Merge pull request #497 from pherl/config_hJisi Liu2015-06-1613-156/+23
|\ \ \ | |/ / |/| | Check HAVE_CONFIG_H before including "config.h"
| * | Make the code independent of config.hJisi Liu2015-06-1613-156/+23
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #499 from xfxyjwf/appveyorFeng Xiao2015-06-151-1/+1
|\ \ | | | | | | Add a badge for AppVeyor build.
| * | Add a badge for AppVeyor build.Feng Xiao2015-06-151-1/+1
| | | | | | | | | | | | Change-Id: Ic59d78d699af0e5f50377f83c8a7ea9a78074d81
* | | Merge pull request #488 from AustinSchuh/ruby_test_fixFeng Xiao2015-06-151-0/+4
|\ \ \ | |/ / |/| | Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUF
| * | Modified FindRubyTestDir to use GOOGLE_THIRD_PARTY_PROTOBUFAustin Schuh2015-06-101-0/+4
| | |
* | | Merge pull request #498 from pherl/rmconfigJisi Liu2015-06-132-8/+0
|\ \ \ | | | | | | | | Remove config.h.include which is no longer needed
| * | | Remove the file from Makefile.amJisi Liu2015-06-131-1/+0
| | | | | | | | | | | | | | | | Change-Id: I2015df2409aa95401af658b40023c8f9b9d75068
| * | | Remove config.h.include which is no longer needed as pbconfig.h is not aJisi Liu2015-06-131-7/+0
|/ / / | | | | | | | | | | | | | | | generated file now. Change-Id: I68b397e7fa9248abc93d5c12efd5cd31e380c9ab
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-13 03:59:13 +0000