aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1049 from jskeet/any-formatJon Skeet2015-12-1722-118/+192
|\ | | | | Handle Any formatting for diagnostic purposes
| * Generated code changes from previous commit.Jon Skeet2015-12-1519-114/+117
| |
| * Make ToString() valid without a type registryJon Skeet2015-12-153-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_coreclrJan Tattermusch2015-12-161-19/+38
|\ \ | | | | | | Make nuget package support coreCLR
| * | make nuget package support CoreCLRJan Tattermusch2015-12-161-19/+38
| |/
* | Merge pull request #1026 from jskeet/any-conformanceJan Tattermusch2015-12-161-19/+24
|\ \ | |/ |/| Add JSON parsing to conformance tests.
| * Add JSON parsing to conformance tests.Jon Skeet2015-12-161-19/+24
|/
* Merge pull request #1028 from benbennett/cmake_vs_parallel_build_flagFeng Xiao2015-12-121-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 Bennett2015-12-071-0/+2
| |
* | Merge pull request #1041 from thomasvl/use_xc7Thomas Van Lenten2015-12-1113-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 7Thomas Van Lenten2015-12-1013-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_cleansThomas Van Lenten2015-12-102-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 Lenten2015-12-102-0/+2
|/ /
* | Merge pull request #1029 from keveman/masterJoshua Haberman2015-12-108-7/+91
|\ \ | | | | | | Enable fast cpp protos in the python interface.
| * | Bringing in internal::shared_ptr into google:protobuf namespace.Manjunath Kudlur2015-12-096-0/+12
| | | | | | | | | | | | Fixes #1029
| * | Made targets relative to google/protobufManjunath Kudlur2015-12-081-4/+4
| | | | | | | | | | | | Fixes #1029
| * | Added util/python/BUILD to provide //util/python:python_headers dependency ↵Manjunath Kudlur2015-12-081-0/+8
| | | | | | | | | | | | for building use_fast_cpp_protos
| * | Made building the python extension configurable via ↵Manjunath Kudlur2015-12-081-7/+24
| | | | | | | | | | | | --define=use_fast_cpp_protos=true
| * | Updated for c++98 compatibilityManjunath Kudlur2015-12-076-5/+12
| | |
| * | Enable fast cpp protos in the python interface.Manjunath Kudlur2015-12-077-13/+53
| |/
* | Merge pull request #1025 from Yangqing/masterFeng Xiao2015-12-091-47/+38
|\ \ | | | | | | Arena type traits standardization.
| * | Minor changes to match the internal versionYangqing Jia2015-12-091-6/+7
| | |
| * | Arena type traits standardization.Yangqing Jia2015-12-051-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-fixFeng Xiao2015-12-091-1/+1
|\ \ \ | | | | | | | | Fix narrowing implicit cast in generated message [NFC]
| * | | 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...
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-10 14:23:24 +0000