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

ICU-22954 revert making LocalPointer & Co. header-only #3314

Merged
merged 3 commits into from
Dec 23, 2024

Conversation

markusicu
Copy link
Member

Making LocalPointer header-only, with a different namespace when compiling internally, turned out to be problematic.
In particular, there are DLL-exported ICU classes that have LocalPointer members, and while the LocalPointer functions are usually inlined, there is a chance that they need to be DLL-exported.

Therefore, I am reverting those parts of PR #3295 “USet C++ iterator return std::u16string; header-only LocalPointer”.
One commit here is a clean revert. One is a partial revert.

I also had to fix the USet header-only iterator unit test because it can no longer use a LocalUSetPointer. It is now using a std::unique_ptr.

Best to review one commit at a time.

Checklist

  • Required: Issue filed: ICU-22954
  • Required: The PR title must be prefixed with a JIRA Issue number. Example: "ICU-1234 Fix xyz"
  • Required: The PR description must include the link to the Jira Issue, for example by completing the URL in the first checklist item
  • Required: Each commit message must be prefixed with a JIRA Issue number. Example: "ICU-1234 Fix xyz"
  • Issue accepted (done by Technical Committee after discussion)
  • Tests included, if applicable
  • API docs and/or User Guide docs changed or added, if applicable

ALLOW_MANY_COMMITS=true

…only

This reverts commit 5bdb4c4.

Making LocalPointer header-only, with a different namespace when compiling internally,
turned out to be problematic.
…ERNAL, header-only localpointer

This partially reverts commit 3527b3d.

Making LocalPointer header-only, with a different namespace when compiling internally,
turned out to be problematic.
@markusicu markusicu merged commit b0ae845 into unicode-org:main Dec 23, 2024
94 checks passed
@markusicu markusicu deleted the localptr-not-header-only branch December 23, 2024 19:17
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