Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #706 from thomasvl/revert_any_change_2 | Paul Yang | 2015-08-11 | 3 | -121/+1 |
|\ | | | | | Revert "Add packFrom, unpackTo and is in google.protobuf.Any." | ||||
| * | Revert "Add packFrom, unpackTo and is in google.protobuf.Any." | Thomas Van Lenten | 2015-08-11 | 3 | -121/+1 |
|/ | | | | | | This reverts commit 7366efd81e7f36108aa35e66fca61da8a65762c2. Still some discussion about the api to expose the helpers with. | ||||
* | Merge pull request #649 from cijianzy/master | Paul Yang | 2015-08-11 | 1 | -1/+1 |
|\ | | | | | Update GPBWellKnownTypes.m | ||||
| * | Update GPBWellKnownTypes.m | Yue Zhang | 2015-07-29 | 1 | -1/+1 |
| | | | | | | fix an bug(forgive my english..) | ||||
* | | Merge pull request #703 from jskeet/more-todos | Jan Tattermusch | 2015-08-10 | 7 | -126/+168 |
|\ \ | | | | | | | More TODOs done. | ||||
| * | | More TODOs done. | Jon Skeet | 2015-08-10 | 7 | -126/+168 |
|/ / | | | | | | | | | | | - Removed a TODO without change in DescriptorPool.LookupSymbol - the TODOs were around performance, and this is only used during descriptor initialization - Make the CodedInputStream limits read-only, adding a static factory method for the rare cases when this is useful - Extracted IDeepCloneable into its own file. | ||||
* | | Merge pull request #701 from jskeet/map-views | Jon Skeet | 2015-08-10 | 2 | -4/+180 |
|\ \ | | | | | | | Implement Keys and Values as views in MapField | ||||
| * | | Fix parameter name in exception. | Jon Skeet | 2015-08-10 | 1 | -1/+1 |
| | | | |||||
| * | | Implement ICollection.CopyTo (using Array) for MapField views. | Jon Skeet | 2015-08-10 | 2 | -1/+26 |
| | | | |||||
| * | | Implement Keys and Values as views | Jon Skeet | 2015-08-08 | 2 | -4/+155 |
| | | | |||||
* | | | Merge pull request #699 from jskeet/validate_packed | Jon Skeet | 2015-08-10 | 3 | -4/+18 |
|\ \ \ | | | | | | | | | Make FieldDescriptor.IsPacked work appropriately. | ||||
| * | | | Make FieldDescriptor.IsPacked work appropriately. | Jon Skeet | 2015-08-08 | 3 | -4/+18 |
| |/ / | | | | | | | | | | | | | This is a bit of a grotty hack, as we need to sort of fake proto2 field presence, but with only a proto3 version of the descriptor messages (a bit like oneof detection). Should be okay, but will need to be careful of this if we ever implement proto2. | ||||
* | | | Merge pull request #700 from jskeet/remove-packed-hack | Jan Tattermusch | 2015-08-08 | 2 | -12/+1 |
|\ \ \ | |/ / |/| | | Remove our own version of MakeTag now that the main one is fixed. | ||||
| * | | Remove our own version of MakeTag now that the main one is fixed. | Jon Skeet | 2015-08-07 | 2 | -12/+1 |
| | | | | | | | | | | | | "Tested" by regenerating code and observing that there are no changes. | ||||
* | | | Merge pull request #695 from jskeet/remove-todos | Jon Skeet | 2015-08-08 | 17 | -103/+83 |
|\ \ \ | | | | | | | | | Tidying up | ||||
| * | | | Address review comments. | Jon Skeet | 2015-08-08 | 1 | -2/+0 |
| | | | | |||||
| * | | | Remove reference to generic types within XML comment. | Jon Skeet | 2015-08-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Visual Studio is happy with it, but Mono isn't :( | ||||
| * | | | Tidying up - fix a bunch of TODOs and remove outdated ones. | Jon Skeet | 2015-08-08 | 17 | -102/+84 |
|/ / / | |||||
* | | | Merge pull request #694 from jskeet/groups | Jon Skeet | 2015-08-08 | 29 | -488/+303 |
|\ \ \ | |/ / |/| | | Fix groups handling in C# | ||||
| * | | Address review comments. | Jon Skeet | 2015-08-08 | 2 | -2/+24 |
| | | | |||||
| * | | Generated code for previous commit. | Jon Skeet | 2015-08-06 | 21 | -452/+142 |
| | | | |||||
| * | | Skip groups properly. | Jon Skeet | 2015-08-06 | 7 | -36/+139 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the generated code doesn't need to check for end group tags, as it will skip whole groups at a time. Currently it will ignore extraneous end group tags, which may or may not be a good thing. Renamed ConsumeLastField to SkipLastField as it felt more natural. Removed WireFormat.IsEndGroupTag as it's no longer useful. This mostly fixes issue 688. (Generated code changes coming in next commit.) | ||||
* | | | Merge pull request #645 from zsurocking/master | Paul Yang | 2015-08-06 | 35 | -104/+225 |
|\ \ \ | | | | | | | | | Down integrate. Generate a package name suffix ".nano" for nano messages | ||||
| * \ \ | Merge remote-tracking branch 'upstream/master' | Xiao Hang | 2015-08-04 | 411 | -255904/+34404 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/zsurocking/protobuf | Xiao Hang | 2015-08-04 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of https://github.com/zsurocking/protobuf | Xiao Hang | 2015-07-29 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge branch 'master' of https://github.com/zsurocking/protobuf | Xiao Hang | 2015-08-04 | 20 | -28/+28 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | |||||
| | * | | / | Generate a package name suffix ".nano" for nano messages | Xiao Hang | 2015-07-27 | 5 | -58/+174 |
| | | |_|/ | | |/| | | | | | | | | | | | | Also introducing an option javanano_use_deprecated_package to allow users to disable the suffix | ||||
| * / | | | Generate a package name suffix ".nano" for nano messages | Xiao Hang | 2015-07-29 | 6 | -63/+179 |
| |/ / / | | | | | | | | | | | | | Also introducing an option javanano_use_deprecated_package to allow users to disable the suffix | ||||
* | | | | Merge pull request #696 from TeBoring/temp | Paul Yang | 2015-08-06 | 4 | -4/+0 |
|\ \ \ \ | |_|_|/ |/| | | | Remove unused .pb.h #includes. | ||||
| * | | | Remove unused .pb.h #includes. | Bo Yang | 2015-08-06 | 4 | -4/+0 |
|/ / / | |||||
* | | | Merge pull request #692 from jskeet/tag-0 | Jan Tattermusch | 2015-08-05 | 28 | -405/+167 |
|\ \ \ | | | | | | | | | Change ReadTag/PeekTag behaviour to return 0 at EOF | ||||
| * | | | Make InvalidProtocolBufferException.InvalidTag internal. | Jon Skeet | 2015-08-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | We don't need to expose the InvalidProtocolBufferException factory method now that the generated code doesn't throw the exception. | ||||
| * | | | Generated code changes for previous commit. | Jon Skeet | 2015-08-05 | 19 | -339/+113 |
| | | | | |||||
| * | | | Change ReadTag and PeekTag to just use 0 as a return value for "end of ↵ | Jon Skeet | 2015-08-05 | 8 | -65/+53 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | stream", rather than using an awkward out parameter. This simplifies quite a lot of code. Generated code in next commit. | ||||
* | | | Merge pull request #689 from jskeet/fix-eof | Jon Skeet | 2015-08-05 | 32 | -10/+2897 |
|\ \ \ | | | | | | | | | C# conformance tests | ||||
| * | | | Update AssemblyInfo for conformance - mostly to fix version numbers. | Jon Skeet | 2015-08-05 | 1 | -23/+35 |
| | | | | |||||
| * | | | Validate that after reading a message, we've consumed as many bytes as we ↵ | Jon Skeet | 2015-08-05 | 3 | -30/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | expected to. We should now have no conformance failures. | ||||
| * | | | Generated code changes for previous commit. | Jon Skeet | 2015-08-05 | 19 | -0/+113 |
| | | | | |||||
| * | | | Consume unknown fields when parsing. | Jon Skeet | 2015-08-05 | 3 | -1/+64 |
| | | | | | | | | | | | | | | | | | | | | This is expected to be the cause of the conformance test failures. Generated code in next commit. | ||||
| * | | | Added C# conformance tests. | Jon Skeet | 2015-08-05 | 3 | -1/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests are run from Travis in the same way as on other platforms. Currently some expected failures - but only expected in that they're what we got to start with. Will try to fix them in other pull requests. | ||||
| * | | | First pass at C# conformance tests. | Jon Skeet | 2015-08-05 | 8 | -0/+2642 |
|/ / / | | | | | | | | | | Completely untested so far - easier to get started in VS and then transfer to Linux for tweaking... | ||||
* | | | Merge pull request #691 from jskeet/xml-documentation | Jon Skeet | 2015-08-05 | 27 | -108/+742 |
|\ \ \ | | | | | | | | | Document everything, and turn on errors if we fail to document anything in the future | ||||
| * | | | Fix one cref that Mono was unhappy with | Jon Skeet | 2015-08-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Document everything, and turn on errors if we fail to document anything in ↵ | Jon Skeet | 2015-08-04 | 26 | -107/+741 |
| | |/ | |/| | | | | | | | the future. | ||||
* | | | Merge pull request #684 from jskeet/unused | Jan Tattermusch | 2015-08-04 | 3 | -3/+3 |
|\ \ \ | |/ / |/| | | Fix build warnings around unused variables | ||||
| * | | Fix build warnings around unused variables | Jon Skeet | 2015-08-04 | 3 | -3/+3 |
|/ / | |||||
* | | Merge pull request #653 from airtimemedia/master | Feng Xiao | 2015-08-03 | 8 | -13/+9 |
|\ \ | | | | | | | Various compilation fixes | ||||
| * | | Move pthread include. | Tom Hughes | 2015-07-30 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | Based on pull request feedback. See commit 60c5222 for why the pthread header is necessary. | ||||
| * | | Remove unused private fields. | Tom Hughes | 2015-07-29 | 4 | -12/+2 |
| | | | | | | | | | | | | | | | Fixes compilation when -Wunused-private-field is enabled (e.g., when using -Wall). |