Integrate changes from upstream/master into csharp-experimental #629
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Install google/protobuf/stubs/status.h, and google/protobuf/stubs/stringpiece.h -- these are required in order to include google/protobuf/util/type_resolver.h. Install google/protobuf/stubs/bytestream.h -- this is required in order to include google/protobuf/util/json_util.h.
This involved fixing a few important bugs in the Ruby implementation -- mostly cases of mixing upb field types and descriptor types (upb field types do not distinguish between int/sint/fixed/sfixed like descriptor types do). Also added protobuf-specific exceptions so parse errors can be caught specifically. Change-Id: Ib49d3db976900b2c6f3455c8b88af52cfb86e036
Change-Id: I223783111d743aa5193bf70fa1b9b54c7b4389c3
Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
Change-Id: I5f6cbc2430200e3751ad754cc7ae604338db6f91
Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64
ignore UTF-8 BOM
Split up common.h headers
The motivation is that gcc 4.8+ and clang trunk warn on unused local typedefs, which COMPILE_ASSERT adds. After this change, the warning will be happy at least in C++11 builds. static_assert also produces a slighly nicer diagnostic than the typedef method. google/re2@eb93e8b did the same change in re2.
This is to prepare removing those additional headers in common.h Change-Id: I707d6d8eaf193eb28195a827c7fec738b968ab3e
Addming missing includes in stubs headers.
Change-Id: Id008ebac5159f773e1bde8b85acb2626cbd16de8
Change-Id: If7b1cc0f03f609a7f43ddafc8509b44207c60910
Added Ruby to conformance tests.
Let GOOGLE_COMPILE_ASSERT use static_assert if available.
Update addressbook.proto and examples code to proto3
|
We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm. |
|
Looks like the CI failure is jruby... we will want to follow up on this, but I don't think it needs to be a problem for this commit. |
jskeet
added a commit
that referenced
this pull request
Jul 21, 2015
Integrate changes from upstream/master into csharp-experimental
adellahlou
pushed a commit
to adellahlou/protobuf
that referenced
this pull request
Apr 20, 2023
…ss, compiles with strictNullChecks by default now, see protocolbuffers#635; Docs: Added SVG logo, see protocolbuffers#629; Other: Minor codegen enhancements
bithium
pushed a commit
to bithium/protobuf
that referenced
this pull request
Sep 4, 2023
Integrate changes from upstream/master into csharp-experimental
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Final step before creating a pull request to merge everything into upstream/master.