aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | Exclude cachedSize when printing fields.Brian Duff2015-04-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85563b74237d38c1e447b7286f5f6e62d57e3d63
| | | * | | | | Add clone() method support for nano.Brian Duff2015-04-2820-10/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstreamed from Another Place (cr/57247854). Change-Id: I2aaf59544c0f5ae21a51891d8a5eeda1dc722c90
| | | * | | | | When no clear() is generated, still initialize fields.Brian Duff2015-04-284-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android-review.googlesource.com/#/c/67890/ removed field initialization from the ctor, making it just call clear() instead. When I added the generate_clear option back (as part of the reftypes compat mode) in https://android-review.googlesource.com/#/c/109530/, I forgot to ensure that what clear() used to do was inlined in the constructor. This change fixes NPEs that are happening for users of reftypes_compat_mode who rely on unset repeated fields being empty arrays rather than null. Change-Id: Idb58746c60f4a4054b7ebb5c3b0e76b16ff88184
| | | * | | | | Fix comments.Brian Duff2015-04-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to update these in https://android-review.googlesource.com/#/c/109809/ Change-Id: I53f838e2f134f53964161d9620d5ead00c4a3939
| | | * | | | | Optimize measurement and serialization of nano protos.Charles Munger2015-04-282-23/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Measuring the serialized size of nano protos is now a zero-alloc operation, and serializing a proto now allocates no memory (other than the output buffer) instead of O(total length of strings). Change-Id: Id5e2ac3bdc4ac56c0bf13d725472da3a00c9baec Signed-off-by: Charles Munger <clm@google.com>
| | | * | | | | Fix bug with large extension field numbers.Brian Duff2015-04-284-9/+31
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, extensions with field numbers greater than 268435455 would result in a compile time error in generated code that looks something like this: Foo.java:3178: error: integer number too large: 3346754610 3346754610); This is because we were trying to represent the tag number (an unsigned int) using a java int constant, but java int constants are signed, and can't exceed Integer.MAX_VALUE. Fixed by declaring it as a long instead, and casting it down to an int in the implementation. This is safe, because the tag value always fits in 32 bis. Change-Id: If2017bacb4e20af667eaeaf9b65ddc2c30a7709f
| | * | | | | Merge pull request #303 from xfxyjwf/wktFeng Xiao2015-04-291-1/+11
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Include well-known type protos in "make install".
| | | * | | | Include well-known type protos in "make install".Feng Xiao2015-04-231-1/+11
| | |/ / / /
| | * | | | Merge pull request #287 from zhangkun83/protoc-artifacts-fixupJisi Liu2015-04-212-4/+11
| | |\ \ \ \ | | | | | | | | | | | | | | A few fix-ups for protoc-artifacts
| | | * | | | A few fix-ups.Kun Zhang2015-04-162-4/+11
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. make google/protobuf/stubs/pbconfig.h before making protoc, otherwise it won't build a freshly checked-out code. 2. Document the build environments that have been tested to work. 3. Add support for MINGW64
| | * | | | Merge pull request #290 from xfxyjwf/wktFeng Xiao2015-04-208-21/+425
| | |\ \ \ \ | | | |/ / / | | |/| | | Include all well-known type protos.
| | | * | | Include all well-known type protos.Feng Xiao2015-04-208-21/+425
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I122f1cee71a8a739ea603e52582cb0fa9698f0ed
* | | | | Merge pull request #380 from jtattermusch/csharpJie Luo2015-05-131-8/+28
|\ \ \ \ \ | |/ / / / |/| | | | Update README.md for C#
| * | | | Update README.md for C#Jan Tattermusch2015-05-131-8/+28
|/ / / /
* | | | Merge pull request #379 from jskeet/csharpJie Luo2015-05-137-810/+3781
|\ \ \ \ | | | | | | | | | | Remove the C#-specific field_presence_test.proto, using unittest_no_field_presence.proto instead.
| * | | | Update C# code generation scriptJon Skeet2015-05-131-3/+1
| | | | |
| * | | | Remove the C#-specific field_presence_test.proto, using ↵Jon Skeet2015-05-136-807/+3780
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | unittest_no_field_presence.proto instead. This is the start of establishing a C# namespace of "Google.ProtocolBuffers.TestProtos.Proto3" for proto3-syntax protos. We could optionally split the directory structure as well into Proto2 and Proto3 for clarity.
* | | | Merge pull request #373 from jtattermusch/csharp_generate_protoJon Skeet2015-05-1319-12118/+147
|\ \ \ \ | | | | | | | | | | C# generate_proto.sh and buildall.sh scripts
| * | | | regenerated UnittestImportLite.csJan Tattermusch2015-05-121-1/+3
| | | | |
| * | | | regenerated UnittestImportPublicLiteJan Tattermusch2015-05-121-1/+3
| | | | |
| * | | | Regenerated UnittestExtrasLite.csJan Tattermusch2015-05-121-51/+48
| | | | |
| * | | | Regenerated UnittestDropUnknownFields.csJan Tattermusch2015-05-121-77/+18
| | | | |
| * | | | remove C# files not referenced in any projectJan Tattermusch2015-05-125-11783/+0
| | | | |
| * | | | Regenerate some proto files after ClsCompliance has been droppedJan Tattermusch2015-05-123-47/+0
| | | | |
| * | | | rename FieldPresence to correct nameJan Tattermusch2015-05-122-1/+1
| | | | |
| * | | | got rid of the outdated mono subdirectoryJan Tattermusch2015-05-123-157/+0
| | | | |
| * | | | draft of generate_protos.shJan Tattermusch2015-05-121-0/+52
| | | | |
| * | | | add buildall script for monoJan Tattermusch2015-05-121-0/+22
|/ / / /
* | | | Merge pull request #372 from jtattermusch/csharp_cleanupJie Luo2015-05-122-13/+2
|\ \ \ \ | | | | | | | | | | C# cleanup
| * | | | adding what was missing in .gitignoreJan Tattermusch2015-05-121-0/+2
| | | | |
| * | | | lib subdir is not needed anymoreJan Tattermusch2015-05-121-13/+0
|/ / / /
* | | | Merge pull request #370 from jtattermusch/mono_fixesJie Luo2015-05-128-15/+2
|\ \ \ \ | | | | | | | | | | Fixes for Mono
| * | | | Fix newline assertion in TestJsonFormatted on monoJan Tattermusch2015-05-121-1/+2
| | | | |
| * | | | remove TreatWarningsAsError setting to allow building in MonodevelopJan Tattermusch2015-05-127-14/+0
|/ / / /
* | | | Merge pull request #366 from jskeet/csharpJan Tattermusch2015-05-1248-3039/+3049
|\ \ \ \ | | | | | | | | | | Convert back to using NUnit, which is now loaded via NuGet.
| * | | | Convert back to using NUnit, which is now loaded via NuGet.Jon Skeet2015-05-1248-3039/+3049
|/ / / / | | | | | | | | | | | | | | | | This includes the NUnit test adapter which allows NUnit tests to be run under VS without any extra plugins. Unfortunate the compatibility tests using the abstract test fixture class show up as "external" tests, and aren't well presented - but they do run.
* | | | Merge pull request #352 from jtattermusch/csharp_performance_fixJon Skeet2015-05-091-4/+24
|\ \ \ \ | | | | | | | | | | Performance optimization for small messages without unknown fields
| * | | | Performance optimization for small messages without unknown fieldsJan Tattermusch2015-05-071-4/+24
| | | | |
* | | | | Merge pull request #348 from jskeet/csharpJon Skeet2015-05-0730-9/+44
|\ \ \ \ \ | |/ / / / |/| | | | Add C# namespace to .proto files (e.g. descriptors, unit tests)
| * | | | Regenerate descriptor.pb.cc after csharp_namespace changeJon Skeet2015-05-071-2/+3
| | | | |
| * | | | Add C# namespace to .proto files (e.g. descriptors, unit tests)Jon Skeet2015-05-0629-7/+41
|/ / / /
* | | | Merge pull request #330 from anandolee/csharpJie Luo2015-05-017-38/+1
|\ \ \ \ | | | | | | | | | | Remove ClsCompliant declarations from C# code (fix #318)
| * | | | Remove ClsCompliant declarations from C# codeJie Luo2015-05-017-38/+1
| | | | |
* | | | | Merge pull request #321 from anandolee/csharpJie Luo2015-05-0113-52/+1152
|\| | | | | | | | | | | | | | Field Presence for Protocol Buffer C# Proto3
| * | | | fix commentsJie Luo2015-05-014-6/+5
| | | | |
| * | | | Change field_presence_test.protoJie Luo2015-05-012-6/+2
| | | | |
| * | | | fix commentsJie Luo2015-04-303-34/+5
| | | | |
| * | | | fix commends from Jon SkeetJie Luo2015-04-307-48/+62
| | | | |
| * | | | Merge branch 'csharp' of git://github.com/google/protobuf into google-csharpJie Luo2015-04-30106-41222/+48786
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #324 from jskeet/csharpJon Skeet2015-04-3055-3744/+3278
|\ \ \ \ \ | | | | | | | | | | | | Change to using xUnit for all unit tests, and fetch that via NuGet.