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.

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

Suppress MSVC warning that is not applicable (backport #446) #666

Merged
merged 1 commit into from
Jul 16, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 10, 2024

This triggers a warning in downstream libraries such as:

https://build.osrfoundation.org/job/ign_gazebo-pr-win/5195/msbuild/

'gz::physics::detail::ComposePlugin::type': base-class 'gz::physics::detail::ComposePlugin::n,void>' is already a base-class of 'gz::physics::detail::ComposePlugin::type'

 
After talking with @mxgrey, while this is typically a relevant warning by MSVC, it is not applicable so we can suppress it.

Signed-off-by: Michael Carroll [email protected]


This is an automatic backport of pull request #446 done by Mergify.

@mergify mergify bot requested a review from azeey as a code owner July 10, 2024 15:54
@mergify mergify bot added the conflicts label Jul 10, 2024
@mergify mergify bot requested a review from scpeters as a code owner July 10, 2024 15:54
Copy link
Author

mergify bot commented Jul 10, 2024

Cherry-pick of f2775ac has failed:

On branch mergify/bp/ign-physics5/pr-446
Your branch is up to date with 'origin/ign-physics5'.

You are currently cherry-picking commit f2775ac.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/gz/physics/FeatureList.hh

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Jul 10, 2024
Signed-off-by: Michael Carroll <[email protected]>
(cherry picked from commit f2775ac)
Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey azeey force-pushed the mergify/bp/ign-physics5/pr-446 branch from 226be35 to f97b7c6 Compare July 10, 2024 15:59
@azeey
Copy link
Contributor

azeey commented Jul 10, 2024

I've fixed the conflict. @mjcarroll mind giving this a quick look?

@Crola1702
Copy link

@azeey @iche033 this is ready to be merged, right?

@iche033
Copy link
Contributor

iche033 commented Jul 16, 2024

I believe so, I'll go ahead and merge this.

@iche033 iche033 merged commit 5101d8b into ign-physics5 Jul 16, 2024
10 checks passed
@iche033 iche033 deleted the mergify/bp/ign-physics5/pr-446 branch July 16, 2024 17:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants