aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Fix narrowing implicit cast in generated message [NFC]Kal Conley2015-12-081-1/+1
| | |/ / | |/| |
* | | | Merge pull request #1030 from TeBoring/sandboxPaul Yang2015-12-0819-79/+91
|\ \ \ \ | | | | | | | | | | Use angle bracket for well known type proto header.
| * | | | Use angle bracket for well known type proto header.Bo Yang2015-12-0819-79/+91
| | | | |
* | | | | Merge pull request #1034 from thomasvl/static_assert_fixThomas Van Lenten2015-12-081-4/+9
|\ \ \ \ \ | |_|/ / / |/| | | | Use compiler provided static assert and avoid tripping unused-local-typedef warnings.
| * | | | Use compiler provided static assert and avoid tripping unused-local-typedef ↵Thomas Van Lenten2015-12-081-4/+9
|/ / / / | | | | | | | | | | | | warnings.
* | | | Merge pull request #1027 from thomasvl/more_nullable_supportThomas Van Lenten2015-12-078-53/+156
|\ \ \ \ | |_|/ / |/| | | Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects.
| * | | Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects.Thomas Van Lenten2015-12-078-53/+156
|/ / /
* | | Merge pull request #1024 from martinmaly/wktJisi Liu2015-12-051-0/+3
|\ \ \ | | | | | | | | Making _genproto rules public.
| * | | Making _genproto rules public.Martin Maly2015-12-041-0/+3
| | | | | | | | | | | | | | | | | | | | This enables other xx_proto_library targets to depend on xx_proto_library targets in different packages, and specifically on xx_wkt_protos.
* | | | Merge pull request #1022 from haberman/python-conformance2Joshua Haberman2015-12-048-5/+186
|\ \ \ \ | |/ / / |/| | | Conformance test implementation for Python.
| * | | Remove all bare strings as exceptions.Josh Haberman2015-12-041-3/+6
| | | |
| * | | Added Python failure lists, and fixes to make sure failure propagates.Josh Haberman2015-12-034-1/+33
| | | |
| * | | Added JSON support to Python conformance tests.Josh Haberman2015-12-021-3/+8
| | | |
| * | | Conformance test implementation for Python.Josh Haberman2015-12-025-5/+146
| | | |
* | | | Merge pull request #1023 from girving/py3Joshua Haberman2015-12-042-0/+3
|\ \ \ \ | |_|/ / |/| | | Add srcs_version = "PY2AND3" in BUILD files
| * | | Add srcs_version = "PY2AND3" in BUILD filesGeoffrey Irving2015-12-032-0/+3
|/ / / | | | | | | | | | The sources themselves appear to already be Python 3 clean.
* | | Merge pull request #1014 from damienmg/masterJisi Liu2015-12-031-0/+5
|\ \ \ | | | | | | | | Fix headers for gmock.BUILD
| * | | Fix headers for gmock.BUILDDamien Martin-Guillerez2015-12-011-0/+5
| | |/ | |/| | | | | | | | | | | | | Bazel 0.1.2 fix strict header checks and sandboxing for C++ rules. This change add the necessary headers for gmock so the headers get shipped in the sandbox.
* | | Merge pull request #1021 from thomasvl/fix_err_msgThomas Van Lenten2015-12-0212-12/+12
|\ \ \ | | | | | | | | Tweak the error message as the generate is in the core binary these d…
| * | | Tweak the error message as the generate is in the core binary these days.Thomas Van Lenten2015-12-0212-12/+12
|/ / /
* | | Merge pull request #1020 from thomasvl/block_nilThomas Van Lenten2015-12-021-5/+136
|\ \ \ | |_|/ |/| | Check and throw errors for nil values/keys (like NSDictionary).
| * | Check and throw errors for nil values/keys (like NSDictionary).Thomas Van Lenten2015-12-021-5/+136
| | |
* | | Merge pull request #1019 from thomasvl/correct_conformance_compileThomas Van Lenten2015-12-022-2/+8
|\ \ \ | |/ / |/| | Ensure the conformance build of objc code is using the Mac OS X SDK
| * | Ensure the conformance build of objc code is using the Mac OS X SDK andThomas Van Lenten2015-12-022-2/+8
|/ /
* | Merge pull request #1000 from jskeet/any-formatJon Skeet2015-12-026-525/+894
|\ \ | | | | | | JSON handling for Any
| * | Handle JSON parsing for Any.Jon Skeet2015-12-025-509/+761
| | | | | | | | | | | | This required a rework of the tokenizer to allow for a "replaying" tokenizer, basically in case the @type value comes after the data itself. This rework is nice in some ways (all the pushback and object depth logic in one place) but is a little fragile in terms of token push-back when using the replay tokenizer. It'll be fine for the scenario we need it for, but we should be careful...
| * | JSON formatting for Any.Jon Skeet2015-12-022-18/+135
|/ /
* | Merge pull request #1016 from tswast/tutorial-regionsFeng Xiao2015-12-011-3/+17
|\ \ | |/ |/| Add region tags for protocol buffers tutorials.
| * Add region tags for protocol buffers tutorials.Tim Swast2015-12-011-3/+17
|/ | | | | | | | | Since these tags might be confusing, added a note that these are not part of the normal protocol buffers syntax. I also linked to the main tutorials page that uses these examples https://developers.google.com/protocol-buffers/docs/tutorials so that anyone who arrived here without going through that info first can get more explanation if they want.
* Merge pull request #998 from tswast/goexampleFeng Xiao2015-11-308-0/+410
|\ | | | | Add a Go language example.
| * Add a Go language example.Tim Swast2015-11-258-0/+410
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows the other examples so that it can be used as a tutorial, such as the ones at: https://developers.google.com/protocol-buffers/docs/tutorials Even though Go generally does not use Makefiles, I added targets for the Go examples to be consistent with the other languages. Edit: Fix Travis run. Change to use $HOME instead of ~. Add protoc to path. GOPATH entry cannot start with shell metacharacter '~': "~/gocode" Edit(2): Fix Go code style to address comments.
* | Merge pull request #1011 from c0nk/wip-implicit-cast-fixFeng Xiao2015-11-302-6/+8
|\ \ | | | | | | Fix some narrowing implicit casts [NFC]
| * | Fix some narrowing implicit casts [NFC]Kal Conley2015-11-282-6/+8
|/ /
* | Merge pull request #1007 from dlh3/patch-1Feng Xiao2015-11-251-2/+2
|\ \ | | | | | | Fix minor typo in LazyField javadoc
| * | Fix typo in LazyField javadocDave Hughes2015-11-241-2/+2
|/ / | | | | "equals".equals("euqals") == false
* | Merge pull request #1005 from oon3m0oo/emscriptenFeng Xiao2015-11-242-1/+5
|\ \ | | | | | | Adds support for building protobuf with emscripten
| * | Adds support for buliding protobuf with emscripten; we just needed the ↵Craig Donner2015-11-242-1/+5
|/ / | | | | | | proper platform define used in the right place.
* | Merge pull request #1003 from sainaetr/patch-1Thomas Van Lenten2015-11-231-0/+1
|\| | | | | Update GPBProtocolBuffers.h
| * Update GPBProtocolBuffers.hOsman Cihangir2015-11-241-0/+1
|/
* Merge pull request #1001 from thomasvl/fix_last_objc_conformance_testsThomas Van Lenten2015-11-232-7/+2
|\ | | | | Set the stream limit to the length of the data.
| * Set the stream limit to the length of the data.Thomas Van Lenten2015-11-232-7/+2
|/ | | | - Mark all conformance tests as now passing.
* Merge pull request #980 from thomasvl/obj_conformanceThomas Van Lenten2015-11-237-7/+245
|\ | | | | Add support for the conformance test for objc when run on OS X
| * Add support for the conformance test for objc when run on OS XThomas Van Lenten2015-11-187-7/+245
| |
* | Merge pull request #990 from jskeet/namingJon Skeet2015-11-2229-245/+208
|\ \ | | | | | | Tidying up reflection further
| * | Generated code changes for previous commit (basically ↵Jon Skeet2015-11-2221-22/+22
| | | | | | | | | | | | InternalBuildGeneratedFileFrom => FromGeneratedCode)
| * | Tidy up reflection in advance of attempting to implement DynamicMessage.Jon Skeet2015-11-2210-225/+188
|/ / | | | | | | | | | | | | | | | | There are corner cases where MessageDescriptor.{ClrType,Parser} will return null, and these are now documented. However, normally they *should* be implemented, even for descriptors of for dynamic messages. Ditto FieldDescriptor.Accessor. We'll still need a fair amount of work to implement dynamic messages, but this change means that the public API will be remain intact. Additionally, this change starts making use of C# 6 features in the files that it touches. This is far from exhaustive, and later PRs will have more. Generated code changes coming in the next commit.
* | Merge pull request #994 from jskeet/type-registryJon Skeet2015-11-224-0/+279
|\ \ | | | | | | Added the type registry in advance of implementing Any support.
| * | Added the type registry in advance of implementing Any support.Jon Skeet2015-11-214-0/+279
|/ / | | | | | | Biting off just this bit first as I don't need the changes from a previous PR for this part.
* | Merge pull request #988 from gabikliot/CSharp-SampleUsage-Big-FixJan Tattermusch2015-11-191-2/+5
|\ \ | | | | | | Fixed a bug in CSharp SampleUsage.
| * | Removed redundant comment.Gabriel Kliot2015-11-191-1/+0
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 05:00:46 +0000