Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1049 from jskeet/any-format | Jon Skeet | 2015-12-17 | 22 | -118/+192 |
|\ | | | | | Handle Any formatting for diagnostic purposes | ||||
| * | Generated code changes from previous commit. | Jon Skeet | 2015-12-15 | 19 | -114/+117 |
| | | |||||
| * | Make ToString() valid without a type registry | Jon Skeet | 2015-12-15 | 3 | -4/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses issue #1008, by creating a JsonFormatter which is private and only different to JsonFormatter.Default in terms of reference equality. Other plausible designs: - The same, but expose the diagnostic-only formatter - Add something to settings to say "I don't have a type registry at all" - Change the behaviour of JsonFormatter.Default (bad idea IMO, as we really *don't* want the result of this used as regular JSON to be parsed) Note that just trying to find a separate fix to issue #933 and using that to override Any.ToString() differently wouldn't work for messages that *contain* an Any. Generated code changes follow in the next commit. | ||||
* | | Merge pull request #1051 from jtattermusch/support_coreclr | Jan Tattermusch | 2015-12-16 | 1 | -19/+38 |
|\ \ | | | | | | | Make nuget package support coreCLR | ||||
| * | | make nuget package support CoreCLR | Jan Tattermusch | 2015-12-16 | 1 | -19/+38 |
| |/ | |||||
* | | Merge pull request #1026 from jskeet/any-conformance | Jan Tattermusch | 2015-12-16 | 1 | -19/+24 |
|\ \ | |/ |/| | Add JSON parsing to conformance tests. | ||||
| * | Add JSON parsing to conformance tests. | Jon Skeet | 2015-12-16 | 1 | -19/+24 |
|/ | |||||
* | Merge pull request #1028 from benbennett/cmake_vs_parallel_build_flag | Feng Xiao | 2015-12-12 | 1 | -0/+2 |
|\ | | | | | MSVC MP flag to build with multiple processes in visual studio. | ||||
| * | MSVC MP flag to build with multiple processes in visual studio. | Benjamin Bennett | 2015-12-07 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #1041 from thomasvl/use_xc7 | Thomas Van Lenten | 2015-12-11 | 13 | -44/+80 |
|\ \ | | | | | | | Update the min toolchain for iOS/OS X to be Xcode 7 | ||||
| * | | Update the min toolchain for iOS/OS X to be Xcode 7 | Thomas Van Lenten | 2015-12-10 | 13 | -44/+80 |
|/ / | | | | | | | | | | | | | - Let Xcode update the projects, schemes, and info.plists. - Add workaround for shallow analyzer issues in current Xcode versions (deep analyze gets things correct). - Tweak the Swift based tests to avoid warnings from Xcode 7's XCTest using optionals for autoenclosure results. - No longer tag the ObjC iOS travis test as flaky, xctool seems to manage the simulator pretty well. | ||||
* | | 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... |