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.

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

Cherry-pick: ICU-21461 uprops.h: remove unused gc macros #73

Merged
merged 1 commit into from
Mar 5, 2021

Conversation

jefgen
Copy link
Member

@jefgen jefgen commented Mar 5, 2021

This change cherry-picks the upstream fix to remove macros that use names which are reserved by the C++ standard.

There are upcoming changes to the MSVC STL headers which might use some of these reserved names, which causes conflicts.

Upstream ticket:
https://unicode-org.atlassian.net/browse/ICU-21461

Summary

PR Checklist

  • I have verified that my change is specific to this fork and cannot be made upstream.
  • I am making a maintenance related change.
  • I am making a change that is related to usage internal to Microsoft.
  • I am making a change that is related to the Windows OS build of ICU.
  • CLA signed. If not, please see here to sign the CLA.

This change cherry-picks the upstream fix to remove macros that use
names which are reserved by the C++ standard.

There are upcoming changes to the MSVC STL headers which will use some
of these reserved names, which causes conflicts.

Upstream PR:
unicode-org/icu#1555
Upstream ticket:
https://unicode-org.atlassian.net/browse/ICU-21461
@jefgen jefgen requested review from erik0686 and a team March 5, 2021 21:57
@jefgen jefgen merged commit ad85227 into master Mar 5, 2021
@jefgen jefgen deleted the user/jefgen/cherry-pick-macro-fix branch March 5, 2021 23:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants