aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* only link runtime libraries statically for a static buildJan Tattermusch2015-08-121-12/+13
|
* make VS build link runtime staticallyJan Tattermusch2015-08-081-0/+12
|
* Merge pull request #695 from jskeet/remove-todosJon Skeet2015-08-0817-103/+83
|\ | | | | Tidying up
| * Address review comments.Jon Skeet2015-08-081-2/+0
| |
| * Remove reference to generic types within XML comment.Jon Skeet2015-08-081-2/+2
| | | | | | | | Visual Studio is happy with it, but Mono isn't :(
| * Tidying up - fix a bunch of TODOs and remove outdated ones.Jon Skeet2015-08-0817-102/+84
|/
* Merge pull request #694 from jskeet/groupsJon Skeet2015-08-0829-488/+303
|\ | | | | Fix groups handling in C#
| * Address review comments.Jon Skeet2015-08-082-2/+24
| |
| * Generated code for previous commit.Jon Skeet2015-08-0621-452/+142
| |
| * Skip groups properly.Jon Skeet2015-08-067-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/masterPaul Yang2015-08-0635-104/+225
|\ \ | | | | | | Down integrate. Generate a package name suffix ".nano" for nano messages
| * \ Merge remote-tracking branch 'upstream/master'Xiao Hang2015-08-04411-255904/+34404
| |\ \
| * \ \ Merge branch 'master' of https://github.com/zsurocking/protobufXiao Hang2015-08-040-0/+0
| |\ \ \
| | * \ \ Merge branch 'master' of https://github.com/zsurocking/protobufXiao Hang2015-07-290-0/+0
| | |\ \ \
| * | \ \ \ Merge branch 'master' of https://github.com/zsurocking/protobufXiao Hang2015-08-0420-28/+28
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Generate a package name suffix ".nano" for nano messagesXiao Hang2015-07-275-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 messagesXiao Hang2015-07-296-63/+179
| |/ / / | | | | | | | | | | | | Also introducing an option javanano_use_deprecated_package to allow users to disable the suffix
* | | | Merge pull request #696 from TeBoring/tempPaul Yang2015-08-064-4/+0
|\ \ \ \ | |_|_|/ |/| | | Remove unused .pb.h #includes.
| * | | Remove unused .pb.h #includes.Bo Yang2015-08-064-4/+0
|/ / /
* | | Merge pull request #692 from jskeet/tag-0Jan Tattermusch2015-08-0528-405/+167
|\ \ \ | | | | | | | | Change ReadTag/PeekTag behaviour to return 0 at EOF
| * | | Make InvalidProtocolBufferException.InvalidTag internal.Jon Skeet2015-08-051-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 Skeet2015-08-0519-339/+113
| | | |
| * | | Change ReadTag and PeekTag to just use 0 as a return value for "end of ↵Jon Skeet2015-08-058-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-eofJon Skeet2015-08-0532-10/+2897
|\ \ \ | | | | | | | | C# conformance tests
| * | | Update AssemblyInfo for conformance - mostly to fix version numbers.Jon Skeet2015-08-051-23/+35
| | | |
| * | | Validate that after reading a message, we've consumed as many bytes as we ↵Jon Skeet2015-08-053-30/+47
| | | | | | | | | | | | | | | | | | | | | | | | expected to. We should now have no conformance failures.
| * | | Generated code changes for previous commit.Jon Skeet2015-08-0519-0/+113
| | | |
| * | | Consume unknown fields when parsing.Jon Skeet2015-08-053-1/+64
| | | | | | | | | | | | | | | | | | | | This is expected to be the cause of the conformance test failures. Generated code in next commit.
| * | | Added C# conformance tests.Jon Skeet2015-08-053-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 Skeet2015-08-058-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-documentationJon Skeet2015-08-0527-108/+742
|\ \ \ | | | | | | | | Document everything, and turn on errors if we fail to document anything in the future
| * | | Fix one cref that Mono was unhappy withJon Skeet2015-08-051-1/+1
| | | |
| * | | Document everything, and turn on errors if we fail to document anything in ↵Jon Skeet2015-08-0426-107/+741
| | |/ | |/| | | | | | | the future.
* | | Merge pull request #684 from jskeet/unusedJan Tattermusch2015-08-043-3/+3
|\ \ \ | |/ / |/| | Fix build warnings around unused variables
| * | Fix build warnings around unused variablesJon Skeet2015-08-043-3/+3
|/ /
* | Merge pull request #653 from airtimemedia/masterFeng Xiao2015-08-038-13/+9
|\ \ | | | | | | Various compilation fixes
| * | Move pthread include.Tom Hughes2015-07-302-2/+4
| | | | | | | | | | | | | | | Based on pull request feedback. See commit 60c5222 for why the pthread header is necessary.
| * | Remove unused private fields.Tom Hughes2015-07-294-12/+2
| | | | | | | | | | | | | | | Fixes compilation when -Wunused-private-field is enabled (e.g., when using -Wall).
| * | Fix compilation error when using C++11.Tom Hughes2015-07-291-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 Hughes2015-07-282-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 Hughes2015-07-281-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-fieldmaskJon Skeet2015-08-032-1/+39
|\ \ | | | | | | JSON formatting for FieldMask
| * | JSON formatting for FieldMaskJon Skeet2015-08-032-1/+39
| | |
* | | Merge pull request #677 from jskeet/move-protosJon Skeet2015-08-033-121/+121
|\ \ \ | | | | | | | | Remove a redundant layer of directory hierarchy.
| * | | Remove a redundant layer of directory hierarchy.Jon Skeet2015-08-033-121/+121
| | | |
* | | | Merge pull request #680 from jskeet/aptcaJon Skeet2015-08-031-0/+2
|\ \ \ \ | |_|/ / |/| | | Allow partially-trusted callers again.
| * | | Allow partially-trusted callers again.Jon Skeet2015-08-031-0/+2
| |/ / | | | | | | | | | Fixes issue #552. (And yay, it looks like our build profile supports this...)
* | | Merge pull request #678 from jskeet/stream-ctorJon Skeet2015-08-0311-127/+100
|\ \ \ | |/ / |/| | Expose Coded*Stream constructors directly.
| * | Expose Coded*Stream constructors directly.Jon Skeet2015-08-0311-127/+100
|/ /
* | Merge pull request #675 from jtattermusch/signingJon Skeet2015-08-0314-92/+87
|\ \ | | | | | | Add ReleaseSigned configuration for C#
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-13 11:07:29 +0000