Skip to content

Update tinyxml2 to be under cv namespace #2603

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

Merged

Conversation

john-forrest
Copy link
Contributor

@john-forrest john-forrest commented Jul 13, 2020

Rework tinyxml2 in this module to have namespace cv::tinyxml2
instead of just tinyxml2, so will not clash with other versions
of tinyxml2 at linkage time.

Closes #2590

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

Rework tinyxml2 in this module to have namespace cv::tinyxml2
instead of just tinyxml2, so will not clash with other versions
of tinyxml2 at linkage time.
@john-forrest john-forrest changed the title Update tinyxml2 to be under cv namespace Update tinyxml2 to be under cv namespace #2590 Jul 14, 2020
@john-forrest john-forrest changed the title Update tinyxml2 to be under cv namespace #2590 Update tinyxml2 to be under cv namespace Jul 15, 2020
Copy link
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.

Great! Thank you 👍

@opencv-pushbot opencv-pushbot merged commit 44ceaa9 into opencv:master Jul 15, 2020
@john-forrest john-forrest deleted the issue-2590-hide-tinyxml-in-cv-workspace branch July 15, 2020 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Embedded tinyxml2 clashes with tinyxml2 in parent program
3 participants