aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | 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#
| | * | | Update Makefile.amJan Tattermusch2015-08-021-2/+2
| | | | |
| | * | | make changes and fixes in signingJan Tattermusch2015-08-0210-96/+16
| | | | |
| | * | | added protoc.exe and well known protobuf files to the nuspec fileJan Tattermusch2015-08-021-1/+15
| | | | |
| | * | | build signed assembliesJan Tattermusch2015-08-0215-36/+97
| | | | |
| * | | | Merge pull request #672 from jskeet/json-structJon Skeet2015-08-032-3/+98
| |\ \ \ \ | | | | | | | | | | | | Formatting of Struct as JSON
| | * | | | Initial pass at formatting Struct as JSON.Jon Skeet2015-08-032-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.
| * | | | Merge pull request #671 from jskeet/json-timeJon Skeet2015-08-034-11/+174
| |\ \ \ \ | | |/ / / | |/| | | JSON formatting for Timestamp and Duration
| | * | | Addressed issues raised in code review. Will merge when green.Jon Skeet2015-08-032-26/+18
| | | | |
| | * | | Format JSON for Duration and Timestamp.Jon Skeet2015-08-033-11/+182
| |/ / / | | | | | | | | | | | | This is taking an approach of putting all the logic in JsonFormatter. That's helpful in terms of concealing the details of whether or not to wrap the value in quotes, but it does lack flexibility. I don't *think* we want to allow user-defined formatting of messages, so that much shouldn't be a problem.
| * | | Merge pull request #669 from jskeet/simpify-json-testsJan Tattermusch2015-08-011-60/+71
| |\ \ \ | | | | | | | | | | Simpify json tests
| | * | | Simplify the JSON tests for readabilityJon Skeet2015-07-311-60/+71
| | | | | | | | | | | | | | | | | | | | Use ' instead of " in the expected JSON, then replace it before asserting.
| * | | | Merge pull request #668 from jskeet/json_orderingJan Tattermusch2015-08-014-36/+353
| |\| | | | | | | | | | | | | Fix C# JSON field ordering
| | * | | Fix JSON formatting to always emit fields in field order, including oneofsJon Skeet2015-07-314-36/+353
| | | | |
| * | | | Merge pull request #643 from yukawa/fix_win_unicode_buildPaul Yang2015-07-311-1/+1
| |\ \ \ \ | | | | | | | | | | | | Fix build failure on Windows when Unicode build is enabled.
| | * | | | Fix build failure on Windows when Unicode build is enabled.Yohei Yukawa2015-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up CL for e9abc404df99ef85d3e25aaaccd4aa83e381, which breaks build when UNICODE macro is defined. protoc has explicitly called MBCS version of APIs / funcsions rather than UTF-16 (wchar_t) version of them regardless of UNICODE macro definition (and it indeed works as expected). Hence it makes sense to call GetModuleFileNameA explicitly.
| * | | | | Merge pull request #667 from jskeet/fix-field-orderingsJan Tattermusch2015-07-312-1/+14
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | Fix trivial bug in field orderings.