Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1039 from thomasvl/fix_cleans | Thomas Van Lenten | 2015-12-10 | 2 | -0/+2 |
|\ | | | | | Fix distclean and maintainer-clean to get more generated files. | ||||
| * | Fix dist_clean and maintainer-clean to get more generated files. | Thomas Van Lenten | 2015-12-10 | 2 | -0/+2 |
|/ | |||||
* | Merge pull request #1029 from keveman/master | Joshua Haberman | 2015-12-10 | 8 | -7/+91 |
|\ | | | | | Enable fast cpp protos in the python interface. | ||||
| * | Bringing in internal::shared_ptr into google:protobuf namespace. | Manjunath Kudlur | 2015-12-09 | 6 | -0/+12 |
| | | | | | | | | Fixes #1029 | ||||
| * | Made targets relative to google/protobuf | Manjunath Kudlur | 2015-12-08 | 1 | -4/+4 |
| | | | | | | | | Fixes #1029 | ||||
| * | Added util/python/BUILD to provide //util/python:python_headers dependency ↵ | Manjunath Kudlur | 2015-12-08 | 1 | -0/+8 |
| | | | | | | | | for building use_fast_cpp_protos | ||||
| * | Made building the python extension configurable via ↵ | Manjunath Kudlur | 2015-12-08 | 1 | -7/+24 |
| | | | | | | | | --define=use_fast_cpp_protos=true | ||||
| * | Updated for c++98 compatibility | Manjunath Kudlur | 2015-12-07 | 6 | -5/+12 |
| | | |||||
| * | Enable fast cpp protos in the python interface. | Manjunath Kudlur | 2015-12-07 | 7 | -13/+53 |
| | | |||||
* | | Merge pull request #1025 from Yangqing/master | Feng Xiao | 2015-12-09 | 1 | -47/+38 |
|\ \ | | | | | | | Arena type traits standardization. | ||||
| * | | Minor changes to match the internal version | Yangqing Jia | 2015-12-09 | 1 | -6/+7 |
| | | | |||||
| * | | Arena type traits standardization. | Yangqing Jia | 2015-12-05 | 1 | -47/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is adapted from the branch of @xfxyjwf at: https://github.com/xfxyjwf/protobuf/commit/494716a682ef854168e92231a3cdcc89d587d9b9 and should solve the protobuf compilation problem against nvcc. Tested against nvcc 6.5 and 7.0. | ||||
* | | | Merge pull request #1033 from c0nk/wip-implicit-cast-fix | Feng Xiao | 2015-12-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix narrowing implicit cast in generated message [NFC] | ||||
| * | | | Fix narrowing implicit cast in generated message [NFC] | Kal Conley | 2015-12-08 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1030 from TeBoring/sandbox | Paul Yang | 2015-12-08 | 19 | -79/+91 |
|\ \ \ | | | | | | | | | Use angle bracket for well known type proto header. | ||||
| * | | | Use angle bracket for well known type proto header. | Bo Yang | 2015-12-08 | 19 | -79/+91 |
| | | | | |||||
* | | | | Merge pull request #1034 from thomasvl/static_assert_fix | Thomas Van Lenten | 2015-12-08 | 1 | -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 Lenten | 2015-12-08 | 1 | -4/+9 |
|/ / / | | | | | | | | | | warnings. | ||||
* | | | Merge pull request #1027 from thomasvl/more_nullable_support | Thomas Van Lenten | 2015-12-07 | 8 | -53/+156 |
|\ \ \ | |_|/ |/| | | Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects. | ||||
| * | | Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects. | Thomas Van Lenten | 2015-12-07 | 8 | -53/+156 |
|/ / | |||||
* | | Merge pull request #1024 from martinmaly/wkt | Jisi Liu | 2015-12-05 | 1 | -0/+3 |
|\ \ | | | | | | | Making _genproto rules public. | ||||
| * | | Making _genproto rules public. | Martin Maly | 2015-12-04 | 1 | -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-conformance2 | Joshua Haberman | 2015-12-04 | 8 | -5/+186 |
|\ \ \ | |/ / |/| | | Conformance test implementation for Python. | ||||
| * | | Remove all bare strings as exceptions. | Josh Haberman | 2015-12-04 | 1 | -3/+6 |
| | | | |||||
| * | | Added Python failure lists, and fixes to make sure failure propagates. | Josh Haberman | 2015-12-03 | 4 | -1/+33 |
| | | | |||||
| * | | Added JSON support to Python conformance tests. | Josh Haberman | 2015-12-02 | 1 | -3/+8 |
| | | | |||||
| * | | Conformance test implementation for Python. | Josh Haberman | 2015-12-02 | 5 | -5/+146 |
| | | | |||||
* | | | Merge pull request #1023 from girving/py3 | Joshua Haberman | 2015-12-04 | 2 | -0/+3 |
|\ \ \ | |_|/ |/| | | Add srcs_version = "PY2AND3" in BUILD files | ||||
| * | | Add srcs_version = "PY2AND3" in BUILD files | Geoffrey Irving | 2015-12-03 | 2 | -0/+3 |
|/ / | | | | | | | The sources themselves appear to already be Python 3 clean. | ||||
* | | Merge pull request #1014 from damienmg/master | Jisi Liu | 2015-12-03 | 1 | -0/+5 |
|\ \ | | | | | | | Fix headers for gmock.BUILD | ||||
| * | | Fix headers for gmock.BUILD | Damien Martin-Guillerez | 2015-12-01 | 1 | -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_msg | Thomas Van Lenten | 2015-12-02 | 12 | -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 Lenten | 2015-12-02 | 12 | -12/+12 |
|/ / / | |||||
* | | | Merge pull request #1020 from thomasvl/block_nil | Thomas Van Lenten | 2015-12-02 | 1 | -5/+136 |
|\ \ \ | |_|/ |/| | | Check and throw errors for nil values/keys (like NSDictionary). | ||||
| * | | Check and throw errors for nil values/keys (like NSDictionary). | Thomas Van Lenten | 2015-12-02 | 1 | -5/+136 |
| | | | |||||
* | | | Merge pull request #1019 from thomasvl/correct_conformance_compile | Thomas Van Lenten | 2015-12-02 | 2 | -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 and | Thomas Van Lenten | 2015-12-02 | 2 | -2/+8 |
|/ / | |||||
* | | Merge pull request #1000 from jskeet/any-format | Jon Skeet | 2015-12-02 | 6 | -525/+894 |
|\ \ | | | | | | | JSON handling for Any | ||||
| * | | Handle JSON parsing for Any. | Jon Skeet | 2015-12-02 | 5 | -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 Skeet | 2015-12-02 | 2 | -18/+135 |
|/ / | |||||
* | | Merge pull request #1016 from tswast/tutorial-regions | Feng Xiao | 2015-12-01 | 1 | -3/+17 |
|\ \ | |/ |/| | Add region tags for protocol buffers tutorials. | ||||
| * | Add region tags for protocol buffers tutorials. | Tim Swast | 2015-12-01 | 1 | -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/goexample | Feng Xiao | 2015-11-30 | 8 | -0/+410 |
|\ | | | | | Add a Go language example. | ||||
| * | Add a Go language example. | Tim Swast | 2015-11-25 | 8 | -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-fix | Feng Xiao | 2015-11-30 | 2 | -6/+8 |
|\ \ | | | | | | | Fix some narrowing implicit casts [NFC] | ||||
| * | | Fix some narrowing implicit casts [NFC] | Kal Conley | 2015-11-28 | 2 | -6/+8 |
|/ / | |||||
* | | Merge pull request #1007 from dlh3/patch-1 | Feng Xiao | 2015-11-25 | 1 | -2/+2 |
|\ \ | | | | | | | Fix minor typo in LazyField javadoc | ||||
| * | | Fix typo in LazyField javadoc | Dave Hughes | 2015-11-24 | 1 | -2/+2 |
|/ / | | | | | "equals".equals("euqals") == false | ||||
* | | Merge pull request #1005 from oon3m0oo/emscripten | Feng Xiao | 2015-11-24 | 2 | -1/+5 |
|\ \ | | | | | | | Adds support for building protobuf with emscripten | ||||
| * | | Adds support for buliding protobuf with emscripten; we just needed the ↵ | Craig Donner | 2015-11-24 | 2 | -1/+5 |
|/ / | | | | | | | proper platform define used in the right place. |