Fix Darwin collision of Point/Rect/Size types#18977
Merged
opencv-pushbot merged 1 commit intoopencv:masterfrom Dec 2, 2020
Merged
Fix Darwin collision of Point/Rect/Size types#18977opencv-pushbot merged 1 commit intoopencv:masterfrom
opencv-pushbot merged 1 commit intoopencv:masterfrom
Conversation
9 tasks
Contributor
|
@vpisarev Could you take a look? |
Member
|
/cc @komakai |
Contributor
|
As per my previous comment on #18843 my preferred way to solve this is to mark the Swift extensions that use these types as @nonobjc Note - there is no name clash in Swift, only in Objective-C |
komakai
suggested changes
Dec 1, 2020
Contributor
komakai
left a comment
There was a problem hiding this comment.
This is a breaking change. Please consider a non-breaking change like in: komakai@aa949df
086442e to
29b453e
Compare
Contributor
Author
|
@komakai I've removed the other changes from this PR and cherry-picked komakai@aa949df as you suggested. |
Contributor
Thanks! |
alalek
approved these changes
Dec 2, 2020
4 tasks
Merged
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.
Splitting this out into a standalone PR, based on the initial work here: #18925
This patch prevents a symbol conflict between types
Point/Rect/Sizeand those provided byDarwin:I provided backwards compatibility typealiases, which are used by the existing test suite.
This doesn't attempt to solve #18843, which is still a problem, but would be a bigger undertaking.
Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
Patch to opencv_extra has the same branch name.