aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Add ObjC build to travis setupThomas Van Lenten2015-11-092-1/+34
|/ / | | | | | | | | - Add objc for iOS and OS X builds to travis configs. - Update handing of python install to deal with newer OS X versions.
* | Merge pull request #954 from jskeet/blank-lines-in-commentsJan Tattermusch2015-11-0811-2/+133
|\ \ | | | | | | Stop removing all blank lines in doc comments.
| * | Generated code for previous commit.Jon Skeet2015-11-0610-0/+115
| | |
| * | Stop removing all blank lines in doc comments.Jon Skeet2015-11-061-2/+18
| | | | | | | | | | | | | | | | | | This fixes issue #832. Generated code changes in next commit.
* | | Merge pull request #949 from thomasvl/newer_simsPaul Yang2015-11-061-17/+51
|\ \ \ | |/ / |/| | Tweaks to the Mac build script
| * | Tweaks to the Mac build scriptThomas Van Lenten2015-11-051-17/+51
| | | | | | | | | | | | | | | | | | - Support building with Xcode 6.4 or 7.x - Fix an error in usage info. - Add a flag to build the core parts of protobuf only.
* | | Merge pull request #941 from jskeet/recursion-limitJan Tattermusch2015-11-056-15/+135
|\ \ \ | | | | | | | | Add recursion limit handling to JSON parsing.
| * | | Reimplement JSON recursion by detecting the depth in the tokenizer.Jon Skeet2015-11-054-34/+124
| | | | | | | | | | | | | | | | Added a TODO around a possible change to the tokenizer API, changing PushBack(token) into just Rewind() or something similar.
| * | | Add recursion limit handling to JSON parsing.Jon Skeet2015-11-043-44/+74
| | | | | | | | | | | | | | | | Fixes issue #932.
* | | | Merge pull request #950 from jhump/jh/plugin-proto-in-java-runtimeFeng Xiao2015-11-051-0/+2
|\ \ \ \ | |_|/ / |/| | | include plugin.proto and generated code in protobuf-java
| * | | include plugin.proto and generated code in protobuf-javaJoshua Humphries2015-11-051-0/+2
|/ / /
* | | Merge pull request #940 from jskeet/json-namesJon Skeet2015-11-052-6/+16
|\ \ \ | | | | | | | | Move the creation of the "fields by JSON name" dictionary to the descriptor
| * | | Move the creation of the "fields by JSON name" dictionary to the descriptor.Jon Skeet2015-11-042-6/+16
| |/ /
* | | Merge pull request #942 from jskeet/json-exceptionJan Tattermusch2015-11-058-40/+111
|\ \ \ | | | | | | | | Created a new exception for JSON failures.
| * | | Created a new exception for JSON failures.Jon Skeet2015-11-058-40/+111
| |/ / | | | | | | | | | | | | | | | This is only thrown directly by JsonTokenizer, but surfaces from JsonParser as well. I've added doc comments to hopefully make everything clear. The exception is actually thrown by the reader within JsonTokenizer, in anticipation of keeping track of the location within the document, but that change is not within this PR.
* | | Merge pull request #943 from thomasvl/conformancePaul Yang2015-11-052-1/+6
|\ \ \ | |/ / |/| | Update the Mac build script to include the conformance tests
| * | Update the Mac build script to include the conformance testsThomas Van Lenten2015-11-042-1/+6
|/ / | | | | | | | | - Kick off the conformance tests - Add missing ignore for something generated by a build on the conformance directory.
* | Merge pull request #923 from jskeet/json-parsingJon Skeet2015-11-0317-22/+2915
|\ \ | | | | | | Implement JSON parsing in C#.
| * | Implement JSON parsing in C#.Jon Skeet2015-11-0317-22/+2915
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes all the well-known types except Any. Some aspects are likely to require further work when the details of the JSON parsing expectations are hammered out in more detail. Some of these have "ignored" tests already. Note that the choice *not* to use Json.NET was made for two reasons: - Going from 0 dependencies to 1 dependency is a big hit, and there's not much benefit here - Json.NET parses more leniently than we'd want; accommodating that would be nearly as much work as writing the tokenizer This only really affects the JsonTokenizer, which could be replaced by Json.NET. The JsonParser code would be about the same length with Json.NET... but I wouldn't be as confident in it.
* | | Merge pull request #936 from andrewharp/patch-1Feng Xiao2015-11-031-0/+1
|\ \ \ | | | | | | | | Build protoc for host platform to enable cross-compilation.
| * | | Build protoc for host platform to enable cross-compilation.Andrew Harp2015-11-031-0/+1
| |/ / | | | | | | This is necessary to run protoc on the host as a dependency for Android BUILD targets with Bazel.
* | | Merge pull request #939 from dougkwan/masterFeng Xiao2015-11-036-5/+7
|\ \ \ | |/ / |/| | Add support for POWER Linux
| * | Add support for POWER LinuxDoug Kwan2015-11-036-5/+7
|/ /
* | Merge pull request #930 from pherl/bazel_testJisi Liu2015-11-021-0/+8
|\| | | | | add warning notes for cc|py_proto_library rules.
| * add warning notes for cc|py_proto_library rules.Jisi Liu2015-11-021-0/+8
| | | | | | | | | | To mention that the interface may change or be removed when bazel has support it natively.
* | Merge pull request #931 from xfxyjwf/fix_compileFeng Xiao2015-11-023-3/+4
|\ \ | |/ |/| Fix compilation errors when built internally.
| * Fix compilation errors when built internally.Feng Xiao2015-11-023-3/+4
|/ | | | | | | | 1. mathlimits.h must be included before the inclusion of cmath (which gtest/gtest.h seems to include). 2. hash function for StringPiece doesn't work. Change-Id: I358a25d941a25b10b39fe76780eda41557699811
* Merge pull request #929 from jskeet/unsafe-internalJan Tattermusch2015-11-021-3/+3
|\ | | | | Make BytesString.Unsafe internal (which it should have been all along)
| * Make BytesString.Unsafe internal (which it should have been all along)Jon Skeet2015-11-021-3/+3
| |
* | Merge pull request #924 from bbarenblat/masterFeng Xiao2015-10-317-7/+7
|\ \ | |/ |/| Correct spelling
| * Correct spellingBenjamin Barenblat2015-10-307-7/+7
|/
* Merge pull request #905 from jskeet/wrapper-clearJan Tattermusch2015-10-303-2/+12
|\ | | | | Fix clearing wrapper type fields with reflection.
| * Fix clearing wrapper type fields with reflection.Jon Skeet2015-10-303-2/+12
|/ | | | The nullable value type fields already worked, but the use of the CLR property concealed the difference between string and StringWrapper fields.
* Merge pull request #922 from randomascii/masterFeng Xiao2015-10-297-70/+72
|\ | | | | Get VS 2015 to use const int definitions
| * Get VS 2015 to use const int definitionsBruce Dawson2015-10-297-70/+72
|/ | | | | | | | | | | | | | | | | | VC++ up to VS 2015 RTM does not require explicit storage allocation for static const integers declared in classes. VS 2015 Update 1 requires these storage definitions in some cases. It's unclear exactly what cases - simple tests work with and without the explicit storage allocation. Many previous versions of VC++ have theoretically *allowed* a definition to supply storage, but tests on VC++ 2013 show that this doesn't actually work correctly - it leads to duplicate definition errors in Chromium. So, the change is scoped to VS 2015 only. This change also updates the generated files to match the new generator. TL;DR - this change is necessary in order for Chromium to build with VS 2015 Update 1.
* Merge pull request #861 from haberman/pywarningsJoshua Haberman2015-10-2813-139/+138
|\ | | | | Removed all warnings from the Python/C++ build
| * Pass $CC environment variable through tox.Josh Haberman2015-10-281-0/+1
| |
| * Special-case Clang-only warning flags to Clang.Josh Haberman2015-10-282-4/+4
| |
| * Disable some more warnings to be warnings-free.Josh Haberman2015-10-281-1/+2
| |
| * Fixed compile errors after rebase.Josh Haberman2015-10-281-3/+1
| |
| * Removed all warnings from the Python/C++ build.Josh Haberman2015-10-2813-134/+133
|/ | | | | | | | | | | Also made the Travis build ensure that no warnings are present. These builds were previously spewing many warnings, which was hiding warnings for important things like accidentally using C++11-only features. Change-Id: I56caeee9db48bc78756a3e8d7c14874630627037
* Merge pull request #915 from pherl/masterv3.0.0-beta-1-bzl-fixJisi Liu2015-10-272-1/+16
|\ | | | | add default_runtime attribute to cc|py rules.
| * add default_runtime attribute to cc|py rules.Jisi Liu2015-10-272-1/+16
|/ | | | This adds implicit dependencies to the coressponding runtime libraries.
* Merge pull request #908 from jskeet/oneof-equalityJan Tattermusch2015-10-248-81/+151
|\ | | | | Use oneof case in equality tests
| * Generated code for previous commit (oneof case contributing to hash code and ↵Jon Skeet2015-10-246-81/+133
| | | | | | | | equality).
| * Include the oneof-case in equality and hash code generated code.Jon Skeet2015-10-242-0/+18
| | | | | | | | The included C# test will fail until the regenerated code is used, which is in the next commit.
* | Merge pull request #904 from matthew-wu/masterJisi Liu2015-10-231-1/+1
|\ \ | |/ |/| Change the #include for any.h to use angle brackets instead of quotes
| * Change the #include for any.h to use angle brackets instead of quotes, to be ↵Matthew Wu2015-10-221-1/+1
|/ | | | consistent with other protobuf library includes.
* Merge pull request #903 from pherl/bazel_testJisi Liu2015-10-223-7/+39
|\ | | | | Enable python bazel tests and explicit list python dependencies.
| * Update comments.Jisi Liu2015-10-221-3/+4
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 05:57:08 +0000