Integrate from Piper for C++, Java, and Python #8960
Merged
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
PROTOBUF_SYNC_PIPER
# Conflicts: # src/google/protobuf/descriptor.pb.cc # src/google/protobuf/duration.pb.cc # src/google/protobuf/timestamp.pb.cc # src/google/protobuf/type.pb.cc # src/google/protobuf/wrappers.pb.cc
acozzette
reviewed
Sep 9, 2021
| * This class is created solely for the purpose of sorting map entries by its key and prevent | ||
| * duplicated logic by having a separate comparator for MapEntry and MutableMapEntry. | ||
| * An adapter class that can take a {@link MapEntry} and returns its key and entry. | ||
| * BEGIN GOOGLE-INTERNAL |
There was a problem hiding this comment.
Something must have gone wrong with the sync here. I'm not sure how these annotations work but maybe they only take effect in a // style comment.
There was a problem hiding this comment.
Agreed this shouldn't be here.
acozzette
approved these changes
Sep 9, 2021
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.
Important: this integration must be merged, not squashed!