-
Notifications
You must be signed in to change notification settings - Fork 43
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
Fix build errors and warnings for DART 6.13.0 #465
Conversation
Signed-off-by: Addisu Z. Taddese <[email protected]>
Codecov Report
@@ Coverage Diff @@
## ign-physics2 #465 +/- ##
=============================================
Coverage 83.15% 83.15%
=============================================
Files 108 108
Lines 4210 4210
=============================================
Hits 3501 3501
Misses 709 709
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think my preference would be use macros that are characterized by a feature name, rather than a version number. We can then set those in a single header. Similar to how libav
does it: https://github.com/FFmpeg/FFmpeg/blob/master/libavutil/version.h
I think it makes it clearer from a readability and maintenance point of view, but I would be open to arguments the other way.
I would agree with that if this was based on the presence of a feature, but it really is based on whether we're using a newer API (> 6.13.0) or not. |
I already have this fix in my local setup. LGTM |
@osrf-jenkins retest this please |
I think @mjcarroll's concern can be addressed in a cosmetic way with some extra macros with verbose names: in SimulationFeatures.cc:
in Base.hh:
and then using the presence of those macros in the relevant code |
Define DART_HAS_EACH_SHAPE_NODE_API and DART_HAS_UPSTREAM_FRICTION_VARIABLE_NAMES so the ifdef logic is more clear and readable. Signed-off-by: Steve Peters <[email protected]>
I've implemented these verbose macro names in a separate branch in 51a7fed. If you'd like to merge it into this branch with your own changes, that works, or I can submit it as a separate pull request if you prefer |
Thanks for the changes. I've gone ahead and merged them to this branch. |
Signed-off-by: Addisu Z. Taddese <[email protected]> Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]> Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]> Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Steve Peters <[email protected]>
🦟 Bug fix
Summary
DART 6.13.0 was tagged yesterday and is already available on homebrew. This PR fixes a compilation errors related to
ContactSurfaceParams
, which was a feature added in our fork first and upstreamed. Variable names were changed during the upstreaming process, which now has to be resolved.This also fixes a compilation warning with using
BodyNode::getShapeNodes
which is now deprecated and as been replaced byBodyNode::eachShapeNode
.Checklist
codecheck
passed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-by
messages.