Integrate from Piper for C++, Java, and Python#8902
Merged
acozzette merged 6 commits intoprotocolbuffers:masterfrom Aug 26, 2021
Merged
Integrate from Piper for C++, Java, and Python#8902acozzette merged 6 commits intoprotocolbuffers:masterfrom
acozzette merged 6 commits intoprotocolbuffers:masterfrom
Conversation
added 3 commits
August 20, 2021 15:05
PROTOBUF_SYNC_PIPER
PROTOBUF_SYNC_PIPER
added 3 commits
August 25, 2021 13:43
This style is officially the correct one according to the style guide, but more importantly this fixes a conflict with TRUE and FALSE macros defined on Mac OS.
dlj-NaN
approved these changes
Aug 26, 2021
jtattermusch
added a commit
to jtattermusch/protobuf
that referenced
this pull request
Sep 10, 2021
jtattermusch
added a commit
to jtattermusch/protobuf
that referenced
this pull request
Sep 15, 2021
acozzette
pushed a commit
that referenced
this pull request
Sep 23, 2021
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Important: this integration must be merged, not squashed