Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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). | ||||
| * | | Fix compilation error when using C++11. | Tom Hughes | 2015-07-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue occurs when the template type deduction results in NodeType being const. Shortened version of compile error: no matching function for call to 'operator new' new (p) NodeType(std::forward<Args>(args)...); candidate function not viable: no known conversion from 'const std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > *' to 'void *' for 2nd argument; take the address of the argument with & inline __attribute__ ((__visibility__("hidden"), __always_inline__)) void* operator new (std::size_t, void* __p) noexcept {return __p;} | ||||
| * | | Set cmake include directories on library targets. | Tom Hughes | 2015-07-28 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | cmake targets that depend on these libraries will automatically have these include directories. | ||||
| * | | Include pthread.h when using GOOGLE_PROTOBUF_NO_THREADLOCAL. | Tom Hughes | 2015-07-28 | 1 | -0/+2 |
| |/ | | | | | | | | | When GOOGLE_PROTOBUF_NO_THREADLOCAL is defined, classes that depend on pthread functions are included (such as ThreadLocalStorage). | ||||
* | | Merge pull request #681 from jskeet/json-fieldmask | Jon Skeet | 2015-08-03 | 2 | -1/+39 |
|\ \ | | | | | | | JSON formatting for FieldMask | ||||
| * | | JSON formatting for FieldMask | Jon Skeet | 2015-08-03 | 2 | -1/+39 |
| | | | |||||
* | | | Merge pull request #677 from jskeet/move-protos | Jon Skeet | 2015-08-03 | 3 | -121/+121 |
|\ \ \ | | | | | | | | | Remove a redundant layer of directory hierarchy. | ||||
| * | | | Remove a redundant layer of directory hierarchy. | Jon Skeet | 2015-08-03 | 3 | -121/+121 |
| | | | | |||||
* | | | | Merge pull request #680 from jskeet/aptca | Jon Skeet | 2015-08-03 | 1 | -0/+2 |
|\ \ \ \ | |_|/ / |/| | | | Allow partially-trusted callers again. | ||||
| * | | | Allow partially-trusted callers again. | Jon Skeet | 2015-08-03 | 1 | -0/+2 |
| |/ / | | | | | | | | | | Fixes issue #552. (And yay, it looks like our build profile supports this...) | ||||
* | | | Merge pull request #678 from jskeet/stream-ctor | Jon Skeet | 2015-08-03 | 11 | -127/+100 |
|\ \ \ | |/ / |/| | | Expose Coded*Stream constructors directly. | ||||
| * | | Expose Coded*Stream constructors directly. | Jon Skeet | 2015-08-03 | 11 | -127/+100 |
|/ / | |||||
* | | Merge pull request #675 from jtattermusch/signing | Jon Skeet | 2015-08-03 | 14 | -92/+87 |
|\ \ | | | | | | | Add ReleaseSigned configuration for C# | ||||
| * | | Update Makefile.am | Jan Tattermusch | 2015-08-02 | 1 | -2/+2 |
| | | | |||||
| * | | make changes and fixes in signing | Jan Tattermusch | 2015-08-02 | 10 | -96/+16 |
| | | | |||||
| * | | added protoc.exe and well known protobuf files to the nuspec file | Jan Tattermusch | 2015-08-02 | 1 | -1/+15 |
| | | | |||||
| * | | build signed assemblies | Jan Tattermusch | 2015-08-02 | 15 | -36/+97 |
| | | | |||||
* | | | Merge pull request #672 from jskeet/json-struct | Jon Skeet | 2015-08-03 | 2 | -3/+98 |
|\ \ \ | | | | | | | | | Formatting of Struct as JSON | ||||
| * | | | Initial pass at formatting Struct as JSON. | Jon Skeet | 2015-08-03 | 2 | -3/+98 |
|/ / / | | | | | | | | | | This seems remarkably little code, but it appears to work. I can add tests for invalid structs at some point, once the general approach is approved. |