Skip to content

Fix -Winvalid-noreturn under clang-cl#21639

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
georgthegreat:patch-1
Feb 19, 2022
Merged

Fix -Winvalid-noreturn under clang-cl#21639
opencv-pushbot merged 1 commit intoopencv:3.4from
georgthegreat:patch-1

Conversation

@georgthegreat
Copy link
Copy Markdown
Contributor

@georgthegreat georgthegreat commented Feb 18, 2022 •
edited
Loading

  • [ + ] I agree to contribute to the project under Apache 2 License.
  • [ + ] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • [ + ] The PR is proposed to the proper branch

@georgthegreat
Copy link
Copy Markdown
Contributor Author

georgthegreat commented Feb 18, 2022 •
edited
Loading

I am unsure what was the reason for checking for APPLE all the way.
The author left no comment on this.

__builtin_trap() is available in gcc and clang, and xcode default toolchain is based on clang.

I'have tested the build in the following configurations:

  • gcc on linux
  • clang on linux
  • clang on macos (via cross-compile from linux)
  • clang on windows (via cross-compile from linux)

alalek
alalek approved these changes Feb 19, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@opencv-pushbot opencv-pushbot merged commit 2c83cfc into opencv:3.4 Feb 19, 2022
This was referenced Feb 19, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: build/install category: core

Projects

None yet

Milestone

3.4.18

Development

Successfully merging this pull request may close these issues.

3 participants

@georgthegreat @alalek @opencv-pushbot