gazebosim / gz-physics

Abstract physics interface designed to support simulation and rapid development of robot applications.
https://gazebosim.org
Apache License 2.0
64 stars 42 forks source link

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

Closed mergify[bot] closed 4 months ago

mergify[bot] commented 4 months ago

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 michael@openrobotics.org


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

mergify[bot] commented 4 months ago

Cherry-pick of f2775ac00fd76ca46316ac3d1bbdc1cdb9cc00fa 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

azeey commented 4 months ago

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

Crola1702 commented 4 months ago

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

iche033 commented 4 months ago

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