Skip to content

Fix building with ToT libc++#16740

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
m-gupta:header
Mar 6, 2020
Merged

Fix building with ToT libc++#16740
opencv-pushbot merged 1 commit intoopencv:3.4from
m-gupta:header

Conversation

@m-gupta
Copy link
Copy Markdown

@m-gupta m-gupta commented Mar 5, 2020 •
edited by alalek
Loading

ToT libc++ (LLVM) no longer includes <sstream>
as part of <complex> which breaks building opencv.
Include <sstream> header explcitly to fix this.

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under OpenCV (BSD) License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@alalek
Copy link
Copy Markdown
Member

alalek commented Mar 5, 2020

As a bugfix this patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@m-gupta m-gupta changed the base branch from master to 3.4 March 6, 2020 01:07
Fix building with ToT libc++
880d2af 
ToT libc++ (LLVM) no longer includes <sstream>
as part of <complex> which breaks building opencv.
Include <sstream> header explcitly to fix this.
@m-gupta
Copy link
Copy Markdown
Author

m-gupta commented Mar 6, 2020

Done, please check.

@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Mar 6, 2020

👍

@asmorkalov asmorkalov removed the pr: needs rebase Rebase patch (and squash fixup commits) on the top of target branch label Mar 6, 2020
@opencv-pushbot opencv-pushbot merged commit b33ff22 into opencv:3.4 Mar 6, 2020
@alalek alalek mentioned this pull request Mar 6, 2020
Merged
@m-gupta m-gupta deleted the header branch March 6, 2020 22:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@asmorkalov asmorkalov

Labels

category: build/install

Projects

None yet

Milestone

3.4.10

Development

Successfully merging this pull request may close these issues.

4 participants

@m-gupta @alalek @asmorkalov @opencv-pushbot