aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
| | * | Make ToString() valid without a type registryGravatar Jon Skeet2015-12-15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Remove internal options from proto files.Gravatar Feng Xiao2015-12-14
| | | | | | | | | | | | Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9
* | | Remove the usage of C++11 override.Gravatar Feng Xiao2015-12-14
| | | | | | | | | | | | | | | | | | [skip appveyor] Change-Id: I700f70e734abb6264db29369ecf227a9e1f783e7
* | | Add new files to Makefile.amGravatar Feng Xiao2015-12-14
| | |
| * | Merge pull request #1028 from benbennett/cmake_vs_parallel_build_flagGravatar Feng Xiao2015-12-12
| |\ \ | | | | | | | | MSVC MP flag to build with multiple processes in visual studio.
* | | | Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
|/ / /
* | | Merge pull request #1041 from thomasvl/use_xc7Gravatar Thomas Van Lenten2015-12-11
|\ \ \ | | | | | | | | Update the min toolchain for iOS/OS X to be Xcode 7
| * | | Update the min toolchain for iOS/OS X to be Xcode 7Gravatar Thomas Van Lenten2015-12-10
|/ / / | | | | | | | | | | | | | | | | | | - 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_cleansGravatar Thomas Van Lenten2015-12-10
|\ \ \ | | | | | | | | Fix distclean and maintainer-clean to get more generated files.
| * | | Fix dist_clean and maintainer-clean to get more generated files.Gravatar Thomas Van Lenten2015-12-10
|/ / /
* | | Merge pull request #1029 from keveman/masterGravatar Joshua Haberman2015-12-10
|\ \ \ | | | | | | | | Enable fast cpp protos in the python interface.
* \ \ \ Merge pull request #1025 from Yangqing/masterGravatar Feng Xiao2015-12-09
|\ \ \ \ | | | | | | | | | | Arena type traits standardization.
| * | | | Minor changes to match the internal versionGravatar Yangqing Jia2015-12-09
| | | | |
* | | | | Merge pull request #1033 from c0nk/wip-implicit-cast-fixGravatar Feng Xiao2015-12-09
|\ \ \ \ \ | | | | | | | | | | | | Fix narrowing implicit cast in generated message [NFC]
| | | * | | Bringing in internal::shared_ptr into google:protobuf namespace.Gravatar Manjunath Kudlur2015-12-09
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #1029
| * | | | | Fix narrowing implicit cast in generated message [NFC]Gravatar Kal Conley2015-12-08
| | | | | |
* | | | | | Merge pull request #1030 from TeBoring/sandboxGravatar Paul Yang2015-12-08
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use angle bracket for well known type proto header.
| * | | | | | Use angle bracket for well known type proto header.Gravatar Bo Yang2015-12-08
| | | | | | |
* | | | | | | Merge pull request #1034 from thomasvl/static_assert_fixGravatar Thomas Van Lenten2015-12-08
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Use compiler provided static assert and avoid tripping unused-local-typedef warnings.
| * | | | | | Use compiler provided static assert and avoid tripping unused-local-typedef ↵Gravatar Thomas Van Lenten2015-12-08
|/ / / / / / | | | | | | | | | | | | | | | | | | warnings.
| | | * | | Made targets relative to google/protobufGravatar Manjunath Kudlur2015-12-08
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #1029
| | | * | | Added util/python/BUILD to provide //util/python:python_headers dependency ↵Gravatar Manjunath Kudlur2015-12-08
| | | | | | | | | | | | | | | | | | | | | | | | for building use_fast_cpp_protos
| | | * | | Made building the python extension configurable via ↵Gravatar Manjunath Kudlur2015-12-08
| | | | | | | | | | | | | | | | | | | | | | | | --define=use_fast_cpp_protos=true
| | | * | | Updated for c++98 compatibilityGravatar Manjunath Kudlur2015-12-07
| | | | | |
| | | * | | Enable fast cpp protos in the python interface.Gravatar Manjunath Kudlur2015-12-07
| |_|/ / / |/| | | |
| | | * | MSVC MP flag to build with multiple processes in visual studio.Gravatar Benjamin Bennett2015-12-07
| |_|/ / |/| | |
* | | | Merge pull request #1027 from thomasvl/more_nullable_supportGravatar Thomas Van Lenten2015-12-07
|\ \ \ \ | | | | | | | | | | Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects.
| * | | | Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects.Gravatar Thomas Van Lenten2015-12-07
|/ / / /
| | * / Arena type traits standardization.Gravatar Yangqing Jia2015-12-05
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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 #1024 from martinmaly/wktGravatar Jisi Liu2015-12-05
|\ \ \ | | | | | | | | Making _genproto rules public.
* \ \ \ Merge pull request #1022 from haberman/python-conformance2Gravatar Joshua Haberman2015-12-04
|\ \ \ \ | | | | | | | | | | Conformance test implementation for Python.
| | * | | Making _genproto rules public.Gravatar Martin Maly2015-12-04
| |/ / / |/| | | | | | | | | | | | | | | 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 #1023 from girving/py3Gravatar Joshua Haberman2015-12-04
|\ \ \ \ | |_|/ / |/| | | Add srcs_version = "PY2AND3" in BUILD files
| | * | Remove all bare strings as exceptions.Gravatar Josh Haberman2015-12-04
| | | |
| * | | Add srcs_version = "PY2AND3" in BUILD filesGravatar Geoffrey Irving2015-12-03
|/ / / | | | | | | | | | The sources themselves appear to already be Python 3 clean.
| * | Added Python failure lists, and fixes to make sure failure propagates.Gravatar Josh Haberman2015-12-03
| | |
* | | Merge pull request #1014 from damienmg/masterGravatar Jisi Liu2015-12-03
|\ \ \ | | | | | | | | Fix headers for gmock.BUILD
| | * | Added JSON support to Python conformance tests.Gravatar Josh Haberman2015-12-02
| | | |
| | * | Conformance test implementation for Python.Gravatar Josh Haberman2015-12-02
| | | |
* | | | Merge pull request #1021 from thomasvl/fix_err_msgGravatar Thomas Van Lenten2015-12-02
|\ \ \ \ | | | | | | | | | | 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.Gravatar Thomas Van Lenten2015-12-02
|/ / / /
* | | | Merge pull request #1020 from thomasvl/block_nilGravatar Thomas Van Lenten2015-12-02
|\ \ \ \ | |_|/ / |/| | | Check and throw errors for nil values/keys (like NSDictionary).
* | | | Merge pull request #1019 from thomasvl/correct_conformance_compileGravatar Thomas Van Lenten2015-12-02
|\ \ \ \ | | | | | | | | | | Ensure the conformance build of objc code is using the Mac OS X SDK
| | * | | Check and throw errors for nil values/keys (like NSDictionary).Gravatar Thomas Van Lenten2015-12-02
| |/ / / |/| | |
| * | | Ensure the conformance build of objc code is using the Mac OS X SDK andGravatar Thomas Van Lenten2015-12-02
|/ / /
* | | Merge pull request #1000 from jskeet/any-formatGravatar Jon Skeet2015-12-02
|\ \ \ | | | | | | | | JSON handling for Any
| * | | Handle JSON parsing for Any.Gravatar Jon Skeet2015-12-02
| | | | | | | | | | | | | | | | 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.Gravatar Jon Skeet2015-12-02
|/ / /
* | | Merge pull request #1016 from tswast/tutorial-regionsGravatar Feng Xiao2015-12-01
|\ \ \ | |_|/ |/| | Add region tags for protocol buffers tutorials.
| * | Add region tags for protocol buffers tutorials.Gravatar Tim Swast2015-12-01
|/ / | | | | | | | | | | | | | | | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-26 14:15:52 +0000