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.

Sign up for GitHub

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

Jump to bottom

Make MPark variant public #1522

Merged
merged 1 commit into from
Feb 28, 2022
Merged

Make MPark variant public #1522

merged 1 commit into from
Feb 28, 2022

Conversation

daniel-riehm
Copy link
Collaborator

Possible fix for #1521, making mpark::variant public and moving it to vital/util/.

dstoup
dstoup approved these changes Feb 28, 2022
View reviewed changes
Copy link
Collaborator

@dstoup dstoup left a comment

Choose a reason for hiding this comment

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

Looks good to me. This is pretty much the branch I started putting together before I wrote up the issue. I will wait for Matt or Matthew to chime in but it looks right to me. The branch does successfully allow me to build from an installed kwiver now.

mleotta
mleotta approved these changes Feb 28, 2022
View reviewed changes
Copy link
Member

@mleotta mleotta left a comment

Choose a reason for hiding this comment

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

Looks okay to me as long as we would not expect our variant to conflict with the C++ standard one on compilers that support it. It' doesn't look like that would be the case.

@kwcvrobot
Copy link
Collaborator

Kwiver Mac build succeeded.

@kwcvrobot
Copy link
Collaborator

Kwiver Linux build succeeded.

@kwcvrobot
Copy link
Collaborator

Kwiver Windows build succeeded.

@kwcvrobot
Copy link
Collaborator

Kwiver CentOS build succeeded.

@dstoup
Copy link
Collaborator

dstoup commented Feb 28, 2022

My hope is that passing CI runs indicates we shouldn't expect conflicts. I will merge now so I can get the vidtk dashboards working again.

@dstoup dstoup merged commit c577cae into Kitware:master Feb 28, 2022
@daniel-riehm daniel-riehm mentioned this pull request Feb 28, 2022
Closed
@daniel-riehm daniel-riehm mentioned this pull request Apr 12, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mleotta mleotta mleotta approved these changes

@dstoup dstoup dstoup approved these changes

@mwoehlke-kitware mwoehlke-kitware Awaiting requested review from mwoehlke-kitware

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@daniel-riehm @kwcvrobot @dstoup @mleotta