Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Append field number to accessors if there is conflict" #6282

Merged
merged 1 commit into from
Jun 21, 2019
Merged

Revert "Append field number to accessors if there is conflict" #6282

merged 1 commit into from
Jun 21, 2019

Conversation

TeBoring
Copy link
Contributor

Reverts #6169
No longer needed.
@michaelbausor

@TeBoring TeBoring requested a review from a user June 19, 2019 16:38
@TeBoring TeBoring assigned ghost Jun 19, 2019
@ghost
Copy link

ghost commented Jun 19, 2019

Why is this no longer needed? We may still run into conflict, right? (Just less likely)

@TeBoring
Copy link
Contributor Author

This is specifically added for xxxValue instead of xxxWrapper.
Because _wrapper is less common, this may not be necessary.
Instead some other long term solution may be needed to solve the conflict problem.
For now, I think we don't need to treat xxxWrapper differently.

@TeBoring TeBoring merged commit 815ff7e into 3.8.x Jun 21, 2019
@fowles fowles deleted the revert-6169-3.8.x branch April 6, 2021 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
Assignees
No one assigned
Labels
cla: yes php
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TeBoring @googlebot @protobuf-kokoro