Cherry-pick of df719723: Simplify template exporting macros#7539
Merged
haberman merged 2 commits intoprotocolbuffers:3.12.xfrom May 21, 2020
Merged
Conversation
Contributor
Author
|
With this fix, it got past my original error, but now I got a new one There seems to be still more we need to do in this PR. |
Contributor
Author
|
Here's how to reproduce the error above: The environment is Alpine 3.5 + [Edit:] Updating my base image from Alpine 3.5 to 3.9 seem to have fixed my problem. So this PR is good enough as is to fix my original problem. |
Contributor
|
I see errors after this change (3.12.1->3.12.2). |
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
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.
This is for grpc/grpc#23011 and #6659
Apparently this commit: df71972 has never been merged properly internally, and that got inadvertently merged back here in #7344.
So this PR attempts to re-apply this commit df71972
Apparently the commit ID df71972 == 479ec14, and we are cherry-picking this one particular commit in #6869.